diff --git a/todo_app/templates/index.html b/todo_app/templates/index.html
index 0bfd48d..6a2af4a 100644
--- a/todo_app/templates/index.html
+++ b/todo_app/templates/index.html
@@ -25,10 +25,44 @@ <h1 class="rounded-t bg-slate-800 p-5 text-xl font-semibold text-gray-100">
       {% for item in items %}
       <div
         style="--animation-order: {{loop.index}};"
-        class="nthDelay animate-jump relative h-24 w-48 rounded bg-slate-300 p-3 shadow-lg"
+        class="nthDelay animate-jump relative flex min-h-32 w-48 flex-col rounded bg-slate-300 shadow-lg"
       >
+        <div class="flex justify-end gap-2 rounded-t bg-slate-800 px-2 py-2">
+          <form
+            class="flex items-center justify-center"
+            action="{{ url_for('comeplete_todo_item') }}"
+            method="post"
+          >
+            <button
+              class="{% if item.is_complete %}bg-yellow-600{% else %}bg-emerald-600{% endif %} size-5 rounded font-mono text-sm font-bold text-white transition-all duration-200 ease-in-out hover:scale-125"
+              type="submit"
+              name="item_id"
+              value="{{ item.id }}"
+              aria-label="complete-{{ item.title }}"
+              on
+            >
+              {% if item.is_complete %} > {% else %} ✓ {% endif %}
+            </button>
+          </form>
+          <form
+            class="flex items-center justify-center"
+            action="{{ url_for('remove_todo_item') }}"
+            method="post"
+          >
+            <button
+              class="size-5 rounded bg-red-600 font-mono text-sm font-bold text-white transition-all duration-200 ease-in-out hover:scale-125"
+              type="submit"
+              name="item_id"
+              value="{{ item.id }}"
+              aria-label="delete-{{ item.title }}"
+              on
+            >
+              X
+            </button>
+          </form>
+        </div>
         <div
-          class="mr-auto flex h-full min-h-0 w-full min-w-0 items-center justify-center overflow-hidden overflow-ellipsis text-center"
+          class="mr-auto flex h-full min-h-0 w-full min-w-0 justify-center overflow-hidden overflow-ellipsis p-2 text-center"
           style="
                 {% if item.is_complete %}
                         text-decoration:line-through;
@@ -36,38 +70,6 @@ <h1 class="rounded-t bg-slate-800 p-5 text-xl font-semibold text-gray-100">
         >
           {{ item.title }}
         </div>
-        <form
-          class="absolute right-8 top-1"
-          action="{{ url_for('comeplete_todo_item') }}"
-          method="post"
-        >
-          <button
-            class="{% if item.is_complete %}bg-yellow-600{% else %}bg-green-600{% endif %} size-5 rounded font-mono text-sm font-bold text-white transition-all duration-200 ease-in-out hover:scale-125"
-            type="submit"
-            name="item_id"
-            value="{{ item.id }}"
-            aria-label="complete-{{ item.title }}"
-            on
-          >
-            {% if item.is_complete %} > {% else %} ✓ {% endif %}
-          </button>
-        </form>
-        <form
-          class="absolute right-2 top-1"
-          action="{{ url_for('remove_todo_item') }}"
-          method="post"
-        >
-          <button
-            class="size-5 rounded bg-red-600 font-mono text-sm font-bold text-white transition-all duration-200 ease-in-out hover:scale-125"
-            type="submit"
-            name="item_id"
-            value="{{ item.id }}"
-            aria-label="delete-{{ item.title }}"
-            on
-          >
-            X
-          </button>
-        </form>
       </div>
       {% endfor %}
     </div>