diff --git a/assets/local.db b/assets/local.db
index ec0156d..29da0b4 100644
Binary files a/assets/local.db and b/assets/local.db differ
diff --git a/assets/main.rml b/assets/main.rml
index c7c9f20..bc43316 100644
--- a/assets/main.rml
+++ b/assets/main.rml
@@ -48,45 +48,45 @@
         <p class="error" data-visible="error_message != ''">{{error_message}}</p>
 
         <label>Name:</label>
-        <input type="text" data-value="form.name" />
+        <input type="text" data-value="new_critter_form.name" />
 
         <label>Species:</label>
-        <input type="text" data-value="form.species" />
+        <input type="text" data-value="new_critter_form.species" />
 
         <label>Gender (M/F):</label>
-        <input type="text" data-value="form.gender" />
+        <input type="text" data-value="new_critter_form.gender" />
 
         <label>Mother ID (Optional):</label>
-        <input type="text" data-value="form.mother_id" />
+        <input type="text" data-value="new_critter_form.mother_id" />
 
         <label>Father ID (Optional):</label>
-        <input type="text" data-value="form.father_id" />
+        <input type="text" data-value="new_critter_form.father_id" />
 
         <label>Notes:</label>
-        <textarea data-value="form.notes"></textarea>
+        <textarea data-value="new_critter_form.notes"></textarea>
 
         <div class="modal-buttons">
-          <button data-event-click="submit_add_critter">Save</button>
           <button data-event-click="is_add_critter_dialog_open = false">Cancel</button>
+          <button data-event-click="submit_add_critter">Save</button>
         </div>
       </div>
     </div>
 
 
     <!-- Confirmation Dialog -->
-     <div class="modal-overlay" data-visible="confirmation_dialog_open">
+    <div class="modal-overlay" data-visible="is_confirmation_dialog_open">
       <div class="modal-content">
         <h2>Confirmation</h2>
         
-        <p>{{confirmation_dialog_text}}</p>
-
-        <!-- <p class="error" data-visible="error_message != ''">{{error_message}}</p> -->
+        <p class="dialog-text">{{confirmation_dialog_text}}</p>
 
         <div class="modal-buttons">
-          <button data-event-click="confimation_dialog_result = false">Cancel</button>
-          <button data-event-click="confimation_dialog_result = true">Yes</button>
+          <button data-event-click="confirm_dialog_no">Cancel</button>
+          <button data-event-click="confirm_dialog_yes">Yes</button>
         </div>
       </div>
     </div>
+
+
   </body>
 </rml>
\ No newline at end of file
diff --git a/assets/styles/main.rcss b/assets/styles/main.rcss
index 35087c1..b5412ed 100644
--- a/assets/styles/main.rcss
+++ b/assets/styles/main.rcss
@@ -443,9 +443,26 @@ progress-value {
     font-weight: bold;
 }
 
+.dialog-text {
+    font-size: 25pt;
+    /* font-style: italic; */
+}
+
 .modal-buttons {
     margin-top: 15px;
     display: flex;
-    justify-content: space-between;
+    flex-direction: row;
+    gap: 20px;
+    /* justify-content: space-between; */
+    align-items: center;
+    justify-content: center;
     font-size: 18pt;
+    width: 100%;
+}
+
+.modal-buttons button {
+    width: 50%;
+    height: 50px;
+    font-size: 20pt;
+    line-height: 50px;
 }
\ No newline at end of file
diff --git a/src/ui.cpp b/src/ui.cpp
index 25747d2..a577282 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -53,9 +53,8 @@ bool setup_data_binding(Rml::Context *context, Rml::DataModelHandle &model_handl
     // Confirmation dialog
     dmc.Bind("is_confirmation_dialog_open", &app_data.is_confirmation_dialog_open);
     dmc.Bind("confirmation_dialog_text", &app_data.confirmation_dialog_text);
-    dmc.Bind("confirmation_dialog_result", &app_data.confimation_dialog_result);
-
 
+    // Submit Add Critter
     dmc.BindEventCallback("submit_add_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle handle, Rml::Event &, const Rml::VariantList &) {
         Critter temp;
         temp.name = app_data.new_critter_form.name;
@@ -91,18 +90,49 @@ bool setup_data_binding(Rml::Context *context, Rml::DataModelHandle &model_handl
         }
     });
 
-    dmc.BindEventCallback("delete_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle handle, Rml::Event &, const Rml::VariantList &args) {
+    // Request Critter Deletion
+    dmc.BindEventCallback("delete_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &args) {
         if (args.empty()) return;
 
+        Rml::DataModelHandle handle = const_handle;
+
         int target_id = args[0].Get<int>();
 
-        if (db_delete_critter(target_id)) {
-            critters.erase(target_id);
-            sync_map_to_list(critters, critter_list);
-            handle.DirtyVariable("critters");
-            std::cout << "[INFO] Deleted critter with ID #" << target_id << std::endl;
+        app_data.confirmation_dialog_text = "Are you sure you want to delete critter '" + critters[target_id].name + "'? This action cannot be undone.";
+        
+        app_data.on_confirm_action = [&critters, &critter_list, target_id, const_handle]() {
+            Rml::DataModelHandle handle = const_handle; 
+            if (db_delete_critter(target_id)) {
+                critters.erase(target_id);
+                sync_map_to_list(critters, critter_list);
+                handle.DirtyVariable("critters");
+                std::cout << "[INFO] Deleted critter with ID #" << target_id << std::endl;
+            }
+        };
+
+        app_data.is_confirmation_dialog_open = true;
+        handle.DirtyVariable("confirmation_dialog_text");
+        handle.DirtyVariable("is_confirmation_dialog_open");
+    });
+
+    dmc.BindEventCallback("confirm_dialog_yes", [&app_data](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &) {
+        Rml::DataModelHandle handle = const_handle; 
+
+        if (app_data.on_confirm_action) {
+            app_data.on_confirm_action();
+            app_data.on_confirm_action = nullptr;
         }
-    }); 
+        app_data.is_confirmation_dialog_open = false;
+        handle.DirtyVariable("is_confirmation_dialog_open");
+    });
+
+    dmc.BindEventCallback("confirm_dialog_no", [&app_data](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &) {
+        Rml::DataModelHandle handle = const_handle;
+
+        app_data.on_confirm_action = nullptr;
+        app_data.is_confirmation_dialog_open = false;
+        handle.DirtyVariable("is_confirmation_dialog_open");
+    });
 
     model_handle = dmc.GetModelHandle();
     return true;
diff --git a/src/ui.hpp b/src/ui.hpp
index 7921d3d..a00b55c 100644
--- a/src/ui.hpp
+++ b/src/ui.hpp
@@ -4,6 +4,7 @@
 #include <RmlUi/Config/Config.h>
 #include <RmlUi/Core/Context.h>
 #include <RmlUi/Core/DataModelHandle.h>
+#include <functional>
 #include <map>
 #include <vector>
 
@@ -33,6 +34,8 @@ struct AppData {
     bool confimation_dialog_result = false;
     Rml::String error_message;
     NewCritterForm new_critter_form;
+
+    std::function<void()> on_confirm_action = nullptr;
 };
 
 void sync_map_to_list(const std::map<int, Critter> &critters, std::vector<CritterEntry> &critter_list);