diff --git a/src/components/item_form.rs b/src/components/item_form.rs
index 3e94952..c82a1d7 100644
--- a/src/components/item_form.rs
+++ b/src/components/item_form.rs
@@ -1,23 +1,37 @@
 use leptos::*;
+use leptos_dom::ev::SubmitEvent; // Import the correct event type
 
 #[component]
-pub fn ItemForm(on_submit: Box<dyn Fn(String, String, Vec<(String, String)>)>) -> impl IntoView {
-    let name = create_signal(String::new());
-    let description = create_signal(String::new());
-    let tags = create_signal(vec![]);
+pub fn ItemForm(on_submit: Box<dyn Fn(String, String, Vec<String>)>) -> impl IntoView {
+    let (name, set_name) = create_signal(String::new());
+    let (description, set_description) = create_signal(String::new());
+    let (tags, set_tags) = create_signal(Vec::<String>::new());
 
-    let handle_submit = move |_| {
-        on_submit(name.get().clone(), description.get().clone(), tags.get().clone());
-        name.set(String::new());
-        description.set(String::new());
-        tags.set(vec![]);
+    // Use SubmitEvent for the form submission handler
+    let handle_submit = move |ev: SubmitEvent| {
+        ev.prevent_default(); // Prevent form submission from reloading the page
+        on_submit(name.get(), description.get(), tags.get().clone());
+
+        // Reset values after submission
+        set_name.update(|n| *n = String::new());
+        set_description.update(|d| *d = String::new());
+        set_tags.update(|t| t.clear());
     };
 
     view! {
         <form on:submit=handle_submit>
-            <input type="text" placeholder="Name" value=name.clone() on:input=move |e| name.set(event_target_value(&e)) />
-            <textarea placeholder="Description" value=description.clone() on:input=move |e| description.set(event_target_value(&e)) />
+            <input
+                type="text"
+                placeholder="Name"
+                value={name.get()}
+                on:input=move |e| set_name.set(event_target_value(&e))
+            />
+            <textarea
+                placeholder="Description"
+                value={description.get()}
+                on:input=move |e| set_description.set(event_target_value(&e))
+            />
             <button type="submit">{ "Add Item" }</button>
         </form>
     }
-}
\ No newline at end of file
+}