diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index b728051..b180621 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -55,7 +55,10 @@
           <div class="text-lg font-semibold"><%= @next_task.title %></div>
           <div class="text-sm text-zinc-600 dark:text-amber-100/80"><%= format_dt(@next_task.due_at) %> · <%= @next_task.task_type_label %> · <%= priority_badge(@next_task.priority) %></div>
         </div>
-        <%= button_to "Completa", complete_task_path(@next_task), method: :patch, class: "rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white" %>
+        <div class="flex flex-wrap gap-2">
+          <%= button_to "Completa", complete_task_path(@next_task), method: :patch, class: "rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white" %>
+          <%= link_to "Modifica", edit_task_path(@next_task), class: "rounded-lg border border-amber-400 bg-white px-4 py-2 text-sm font-medium text-amber-900 hover:bg-amber-50 dark:bg-transparent dark:text-amber-100 dark:hover:bg-amber-900/30" %>
+        </div>
       </div>
     </section>
   <% end %>
@@ -147,11 +150,14 @@
         <h3 class="mt-3 text-sm font-semibold text-zinc-600 dark:text-zinc-400">Pendenti</h3>
         <%= render "shared/task_list", tasks: @pending_tasks %>
         <h3 class="mt-4 text-sm font-semibold text-zinc-600 dark:text-zinc-400">Completati</h3>
-        <ul class="mt-2 space-y-1 text-sm text-zinc-600 dark:text-zinc-300">
+        <ul class="mt-2 divide-y divide-zinc-100 text-sm text-zinc-600 dark:divide-zinc-800 dark:text-zinc-300">
           <% @completed_tasks.each do |task| %>
-            <li>✓ <%= task.title %> · <%= format_dt(task.completed_at) %></li>
+            <li class="flex items-center justify-between gap-2 py-1.5">
+              <span>✓ <%= task.title %> · <%= format_dt(task.completed_at) %></span>
+              <%= link_to "Modifica", edit_task_path(task), class: "shrink-0 text-xs text-zinc-500 hover:underline dark:text-zinc-400" %>
+            </li>
           <% end %>
-          <% if @completed_tasks.blank? %><li class="text-slate-400">Nessuno</li><% end %>
+          <% if @completed_tasks.blank? %><li class="py-1.5 text-slate-400">Nessuno</li><% end %>
         </ul>
       </section>
     </div>
diff --git a/app/views/shared/_task_list.html.erb b/app/views/shared/_task_list.html.erb
index 57547f2..478c37f 100644
--- a/app/views/shared/_task_list.html.erb
+++ b/app/views/shared/_task_list.html.erb
@@ -16,7 +16,7 @@
         </div>
         <div class="flex w-full flex-wrap items-center gap-2 sm:w-auto">
           <%= button_to "Completa", complete_task_path(task), method: :patch, class: "rounded-md bg-emerald-600 px-3 py-1.5 text-xs font-medium text-white hover:bg-emerald-700" %>
-          <%= link_to "Apri", task.organization, class: "rounded-md border border-zinc-300 px-3 py-1.5 text-xs font-medium text-zinc-700 hover:bg-zinc-50 dark:border-zinc-600 dark:text-zinc-200 dark:hover:bg-zinc-800" %>
+          <%= link_to "Modifica", edit_task_path(task), class: "rounded-md border border-zinc-300 px-3 py-1.5 text-xs font-medium text-zinc-700 hover:bg-zinc-50 dark:border-zinc-600 dark:text-zinc-200 dark:hover:bg-zinc-800" %>
         </div>
       </div>
     <% end %>