diff --git a/app.js b/app.js
index 8685a61..345b918 100644
--- a/app.js
+++ b/app.js
@@ -226,8 +226,11 @@ class TeeTracker {
         
         // Initialize
         this.initStorage();
+        this.setupEventListeners();
         this.loadData().then(() => {
-            this.init();
+            this.renderAll();
+            this.initCharts();
+            this.updateSettingsStats();
         });
     }
     
@@ -631,7 +634,8 @@ class TeeTracker {
     // ============================================
     
     init() {
-        this.setupEventListeners();
+        // Initialization is now handled in constructor
+        // This method is kept for backward compatibility
         this.renderAll();
         this.initCharts();
         this.updateSettingsStats();
diff --git a/index.html b/index.html
index dc42916..bbbcaad 100644
--- a/index.html
+++ b/index.html
@@ -386,8 +386,8 @@
                     <textarea id="import-data-textarea" class="modal-textarea" placeholder="{\n  \"teas\": [...],\n  \"entries\": [...]\n}"></textarea>
                 </div>
                 <div class="modal-footer">
-                    <button id="import-data-btn" class="btn btn-primary" onclick="window.app.handleImportData()">📥 Importieren</button>
-                    <button id="cancel-import-btn" class="btn btn-secondary" onclick="window.app.closeImportModal()">Abbrechen</button>
+                    <button id="import-data-btn" class="btn btn-primary">📥 Importieren</button>
+                    <button id="cancel-import-btn" class="btn btn-secondary">Abbrechen</button>
                 </div>
             </div>
         </div>