diff --git a/src/components/EntryForm.svelte b/src/components/EntryForm.svelte
index 8d5a6bc..f136a12 100644
--- a/src/components/EntryForm.svelte
+++ b/src/components/EntryForm.svelte
@@ -103,7 +103,7 @@
       <div class="error-banner">{error}</div>
     {/if}
 
-    <form class="form-card" submitHandler={handleSubmit}>
+    <form class="form-card" onsubmit={(e) => { e.preventDefault(); handleSubmit(); }}>
       {#if formErrors.length > 0}
         <div class="validation-errors">
           {#each formErrors as err}
diff --git a/src/components/MainLayout.svelte b/src/components/MainLayout.svelte
index 806a020..971a1cb 100644
--- a/src/components/MainLayout.svelte
+++ b/src/components/MainLayout.svelte
@@ -89,18 +89,18 @@
     <!-- Content area -->
     <div class="content-area">
       {#if viewMode === 'list'}
-        <EntryList on:select={goDetail} on:add={() => goForm(null)} />
+        <EntryList onSelect={goDetail} onAdd={() => goForm(null)} />
       {:else if viewMode === 'detail' && selectedEntryId}
         <EntryDetail
           entryId={selectedEntryId}
-          on:edit={() => goForm(selectedEntryId)}
-          on:back={goList}
+          onEdit={() => goForm(selectedEntryId)}
+          onBack={goList}
         />
       {:else if viewMode === 'form'}
         <EntryForm
           entryId={selectedEntryId}
-          on:save={goList}
-          on:cancel={handleBack}
+          onSave={goList}
+          onCancel={handleBack}
         />
       {/if}
     </div>