diff --git a/app/Http/Controllers/MaintenanceController.php b/app/Http/Controllers/MaintenanceController.php
index b70a708..16a524e 100644
--- a/app/Http/Controllers/MaintenanceController.php
+++ b/app/Http/Controllers/MaintenanceController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\MaintenanceHistory;
+use Illuminate\Http\Request;
 
 class MaintenanceController extends BaseController
 {
@@ -22,4 +23,12 @@ public function plannedDetail(MaintenanceHistory $maintenance_history)
             'maintenance_history' => $maintenance_history,
         ]);
     }
+
+    public function plannedDetailPut(Request $request, MaintenanceHistory $maintenance_history)
+    {
+        return view('maintenance.planned-detail-done', [
+            'maintenance_history' => $maintenance_history,
+            'maintenance_state' => $request->input('test'),
+        ]);
+    }
 }
diff --git a/app/Livewire/Maintenance/Form.php b/app/Livewire/Maintenance/Form.php
index 95df2d0..3ce96e5 100644
--- a/app/Livewire/Maintenance/Form.php
+++ b/app/Livewire/Maintenance/Form.php
@@ -55,6 +55,17 @@ public function mount($model = null)
         }
     }
 
+    public function updatedHosts($value)
+    {
+        foreach ($this->hosts_tasks as $host_id => $tasks) {
+            if (in_array($host_id, $this->hosts)) {
+                continue;
+            }
+
+            unset($this->hosts_tasks[$host_id]);
+        }
+    }
+
     public function store()
     {
         $validatedData = $this->validate();
@@ -62,7 +73,7 @@ public function store()
         $hosts = Host::whereIn('id', $this->hosts)->get();
         foreach ($hosts as $key => $host) {
             $maintenance->hosts()->attach($host);
-            $tasks = Host::whereIn('id', $this->hosts_tasks[$host->id])->get();
+            $tasks =  Task::whereIn('id', $this->hosts_tasks[$host->id])->get();
             foreach ($tasks as $task) {
                 $maintenance->tasks()->create([
                     'task_id' => $task->id,
diff --git a/resources/views/livewire/maintenance/form.blade.php b/resources/views/livewire/maintenance/form.blade.php
index e673b14..e906b69 100644
--- a/resources/views/livewire/maintenance/form.blade.php
+++ b/resources/views/livewire/maintenance/form.blade.php
@@ -4,12 +4,11 @@
         <x-form::quill group-class="mb-3" type="text" wire:model="description" id="description" label="description" />
         <x-form::input group-class="mb-3" type="text" wire:model="schedule" id="schedule" label="schedule" />
         <x-form::select group-class="mb-3" wire:model.live="hosts" label="Livewire Select" :options="$hosts_available" placeholder="Select value..." multiple />
-        
+
         @foreach($hosts as $key => $host_id)
-            <x-form::select group-class="mb-3" wire:model="hosts_tasks.{{ $host_id }}" label="Select Tasks for Host {{ $hosts_available[$host_id] }}" :options="$hosts_tasks_available" placeholder="Select value..." multiple />
+            <x-form::select group-class="mb-3" wire:key="{{ $host_id }}" wire:model="hosts_tasks.{{ $host_id }}" label="Select Tasks for Host {{ $hosts_available[$host_id] }}" :options="$hosts_tasks_available" placeholder="Select value..." multiple />
         @endforeach
-        
+
         <x-form::button class="btn-primary" type="submit">Create</x-form::button>
-        @dump($hosts_tasks)
     </x-form::form>
 </div>
diff --git a/resources/views/maintenance/planned-detail-done.blade.php b/resources/views/maintenance/planned-detail-done.blade.php
new file mode 100644
index 0000000..0df61b6
--- /dev/null
+++ b/resources/views/maintenance/planned-detail-done.blade.php
@@ -0,0 +1,14 @@
+<x-layout-app>
+    <div class="container-xl">
+        <div class="page-header">
+            <h1>{{ __('Planned Maintenance') }}</h1>
+        </div>
+        <p>{!! $maintenance_history->maintenance->description !!}</p>
+        @foreach ($maintenance_history->historyHosts as $historyHost)
+            <b>{{ $historyHost->host->hostname }}</b>
+            @foreach ($historyHost->historyTasks as $historyTasks)
+                <x-form::checkbox onclick="return false" checked="{{ isset($maintenance_state[$historyHost->id][$historyTasks->id]) ? 'checked' : '' }}" label="{{ $historyTasks->maintenanceTask->task->name }}" name="test-{{ $historyHost->id  }}-{{ $historyTasks->id  }}" />
+            @endforeach
+        @endforeach
+    </div>
+</x-layout-app>
diff --git a/resources/views/maintenance/planned-detail.blade.php b/resources/views/maintenance/planned-detail.blade.php
index f94c659..32037a2 100644
--- a/resources/views/maintenance/planned-detail.blade.php
+++ b/resources/views/maintenance/planned-detail.blade.php
@@ -4,23 +4,23 @@
             <h1>{{ __('Planned Maintenance') }}</h1>
         </div>
         <p>{!! $maintenance_history->maintenance->description !!}</p>
-        <x-form::form action="save" method="PUT">
+        <x-form::form action="{{ route('maintenance.planned.detail.put', ['maintenance_history' => $maintenance_history->id]) }}" method="PUT">
             @foreach ($maintenance_history->historyHosts as $historyHost)
-            <div class="mb-3">
-                <div class="btn-toggle btn py-3 w-100 bg-primary text-start" style="--bs-bg-opacity: .2;" data-bs-toggle="collapse" data-bs-target="#collapse{{ $historyHost->id }}">
-                    <b>{{ $historyHost->host->hostname }}</b>
-                </div>
-                <div class="collapse" id="collapse{{ $historyHost->id }}">
-                    <div class="card card-body mt-2">
-                        @foreach ($historyHost->historyTasks as $historyTasks)
-                        <x-form::checkbox wire:model="test" label="{{$historyTasks->maintenanceTask->task->name}}" />
-                        <p>{!! $historyTasks->maintenanceTask->task->description !!}</p>
-                        @endforeach
+                <div class="mb-3">
+                    <div class="btn-toggle btn py-3 w-100 bg-primary text-start" style="--bs-bg-opacity: .2;" data-bs-toggle="collapse" data-bs-target="#collapse{{ $historyHost->id }}">
+                        <b>{{ $historyHost->host->hostname }}</b>
+                    </div>
+                    <div class="collapse" id="collapse{{ $historyHost->id }}">
+                        <div class="card card-body mt-2">
+                            @foreach ($historyHost->historyTasks as $historyTasks)
+                                <x-form::checkbox name="test[{{ $historyHost->id  }}][{{ $historyTasks->id  }}]" id="test-{{ $historyHost->id  }}-{{ $historyTasks->id  }}" label="{{ $historyTasks->maintenanceTask->task->name }}" />
+                                <p>{!! $historyTasks->maintenanceTask->task->description !!}</p>
+                            @endforeach
+                        </div>
                     </div>
                 </div>
-            </div>
             @endforeach
-            <x-form::button class="btn-primary" type="submit">{{ __('Ukončit')}}</x-form::button>
+            <x-form::button class="btn-primary" type="submit">{{ __('Ukončit') }}</x-form::button>
         </x-form::form>
     </div>
-</x-layout-app>
\ No newline at end of file
+</x-layout-app>
diff --git a/routes/web.php b/routes/web.php
index 0e73331..30778da 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -10,6 +10,7 @@
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
 Route::get('/maintenance/planned', [App\Http\Controllers\MaintenanceController::class, 'planned'])->name('maintenance.planned');
 Route::get('/maintenance/planned/{maintenance_history}', [App\Http\Controllers\MaintenanceController::class, 'plannedDetail'])->name('maintenance.planned.detail');
+Route::put('/maintenance/planned/{maintenance_history}', [App\Http\Controllers\MaintenanceController::class, 'plannedDetailPut'])->name('maintenance.planned.detail.put');
 
 
 Route::get('/host', [App\Http\Controllers\HostController::class, 'index'])->name('host');