diff --git a/app/models/task.rb b/app/models/task.rb
index c22525029..e399fc72c 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -23,4 +23,6 @@ class Task < ApplicationRecord
 
   validates :name, presence: true
   validates :description, presence: true
+
+  default_scope { order(created_at: :asc) }
 end
diff --git a/app/views/organizations/pets/tasks/_tasks.html.erb b/app/views/organizations/pets/tasks/_tasks.html.erb
index 21679f82c..aac2df8db 100644
--- a/app/views/organizations/pets/tasks/_tasks.html.erb
+++ b/app/views/organizations/pets/tasks/_tasks.html.erb
@@ -14,15 +14,18 @@
               <li class="list-group-item">
                 <div class="d-flex justify-content-between
                             align-items-center">
-                  <div>
-                    <strong class="d-block mb-1" ><%= task.name %></strong>
-                    <p><%= task.description %></p>
+
+                  <div class="d-flex align-items-center">
+                    <%= render '/organizations/pets/tasks/tasks_toggle', task: task %>
+                    <div style="padding: 0 10px; margin-top: 15px;">
+                      <strong class="d-block mb-1" ><%= task.name %></strong>
+                      <p><%= task.description %></p>
+                    </div>
                   </div>
 
                   <!-- Right side: Completion status and action buttons -->
                   <div class="text-right">
                     <div class="d-flex align-items-center justify-content-end">
-                      <strong class="m-3"><%= task.completed %></strong>
                       <%= link_to 'Edit', edit_pet_task_path(@pet, task), class: 'btn btn-warning m-2' %>
                       <%= link_to 'Delete', pet_task_path(@pet, task), class: 'btn btn-danger m-2', data: { turbo_method: "delete", turbo_confirm: 'Are you sure?' } %>
                     </div>
diff --git a/app/views/organizations/pets/tasks/_tasks_toggle.html.erb b/app/views/organizations/pets/tasks/_tasks_toggle.html.erb
new file mode 100644
index 000000000..8c007c6c4
--- /dev/null
+++ b/app/views/organizations/pets/tasks/_tasks_toggle.html.erb
@@ -0,0 +1,11 @@
+<div id=<%= "task_toggle_#{task.id}" %>>
+  <%= form_for [@pet, task] do |form| %>
+    <div class='form-group'>
+      <div class="form-check">
+        <%= form.check_box :completed, 
+                          { class: "form-check-input",  
+                          onclick: "this.form.requestSubmit()"} %>
+      </div>
+    </div>
+  <% end %>
+</div>
\ No newline at end of file