diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 908d09d..54609b0 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -2,19 +2,21 @@
 <p><%= @project.description %></p>
 
 <%= turbo_frame_tag "tasks" do %>
-  <ul id="tasks_list">
-    <% # First: pending or in-progress tasks %>
-    <%= render @project.tasks.reject { |t| t.status == "done" } %>
 
-    <% done_tasks = @project.tasks.select { |t| t.status == "done" } %>
-    <% if done_tasks.any? %>
-      <%= render done_tasks %>
+  <ul id="active_tasks">
+    <% @project.tasks.where(status: %w[to_do in_progress]).each do |task| %>
+      <%= render partial: "tasks/task", locals: { task: task } %>
     <% end %>
   </ul>
+
+  <ul id="done_tasks">
+    <% @project.tasks.where(status: "done").each do |task| %>
+      <%= render partial: "tasks/task", locals: { task: task } %>
+    <% end %>
+  </ul>
+
 <% end %>
 
 <%= turbo_frame_tag "new_task" do %>
-  <br>
-  <h2>Add New Task</h2>
   <%= render "tasks/form", project: @project, task: Task.new %>
 <% end %>
diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb
index f3c7ef7..a6a22ea 100644
--- a/app/views/tasks/_form.html.erb
+++ b/app/views/tasks/_form.html.erb
@@ -1,3 +1,5 @@
+<h2>Add New Task</h2>
+
 <%= form_with model: [project, task], local: false do |f| %>
   <p>
     <%= f.label :title %><br>
@@ -6,7 +8,7 @@
 
   <p>
     <%= f.label :status %><br>
-    <%= f.select :status, Task.statuses.keys %>
+    <%= f.select :status, Task.statuses.keys.reject { |s| s == "done" } %>
   </p>
 
   <%= f.submit "Create Task" %>
diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
index 7edd2e7..efd7312 100644
--- a/app/views/tasks/_task.html.erb
+++ b/app/views/tasks/_task.html.erb
@@ -1,4 +1,3 @@
-<turbo-frame id="<%= dom_id(task) %>">
   <li id="<%= dom_id(task) %>" class="task-item <%= 'done-task' if task.status == 'done' %>">
   <div class="task-title"><%= task.title %></div>
   <div class="task-status"><%= task.status.titleize %></div>
@@ -17,4 +16,3 @@
           class: "task-btn destroy-btn" %>
   </div>
 </li>
-</turbo-frame>
\ No newline at end of file
diff --git a/app/views/tasks/complete.turbo_stream.erb b/app/views/tasks/complete.turbo_stream.erb
index 34efcab..7b6386f 100644
--- a/app/views/tasks/complete.turbo_stream.erb
+++ b/app/views/tasks/complete.turbo_stream.erb
@@ -1,3 +1,3 @@
 <%= turbo_stream.replace dom_id(@task) do %>
-  <%= render @task %>
+  <%= render partial: "tasks/task", locals: { task: @task } %>
 <% end %>
diff --git a/app/views/tasks/create.turbo_stream.erb b/app/views/tasks/create.turbo_stream.erb
index 9ec72d4..67cfd7f 100644
--- a/app/views/tasks/create.turbo_stream.erb
+++ b/app/views/tasks/create.turbo_stream.erb
@@ -1,6 +1,6 @@
-<%= turbo_stream.append "tasks" do %>
-  <%= render @task %>   <!-- renders _task.html.erb -->
-<% end %>
+<%= turbo_stream.prepend "active_tasks" do %>
+    <%= render partial: "tasks/task", locals: { task: @task } %>
+  <% end %>
 
 <%= turbo_stream.replace "new_task" do %>
   <%= render "tasks/form", project: @project, task: Task.new %>