diff --git a/backend/app/__init__.py b/backend/app/__init__.py
index 1ebb729..dc4f156 100644
--- a/backend/app/__init__.py
+++ b/backend/app/__init__.py
@@ -29,17 +29,15 @@ def create_app(config_name=None):
         db.create_all()
         _run_migrations()
 
-    @app.route('/', defaults={'path': ''})
-    @app.route('/<path:path>')
-    def serve_react(path):
-        static_folder = app.static_folder
-        if path and os.path.exists(os.path.join(static_folder, path)):
-            return send_from_directory(static_folder, path)
-        return send_from_directory(static_folder, 'index.html')
-    
+    @app.route('/')
+    def index():
+        return send_from_directory(app.static_folder, 'index.html')
+
     @app.errorhandler(404)
-    def not_found(e):
-        return jsonify({'error': 'Resource not found', 'message': str(e)}), 404
+    def handle_404(e):
+        if request.path.startswith('/api/'):
+            return jsonify({'error': 'Resource not found', 'message': str(e)}), 404
+        return send_from_directory(app.static_folder, 'index.html')
 
     @app.errorhandler(400)
     def bad_request(e):
diff --git a/frontend/src/components/Calendar/MainCalendar.jsx b/frontend/src/components/Calendar/MainCalendar.jsx
index 47c1732..8b7664a 100644
--- a/frontend/src/components/Calendar/MainCalendar.jsx
+++ b/frontend/src/components/Calendar/MainCalendar.jsx
@@ -69,6 +69,7 @@ export default function MainCalendar({ onCalendarReady }) {
   }, [openFocus])
 
   const handleEventDrop = useCallback(async ({ event, oldEvent }) => {
+    const { deliverableId } = event.extendedProps
     const newDate = event.startStr.substring(0, 10)
     const oldDate = oldEvent.startStr.substring(0, 10)
     await storeUpdate(deliverableId, { due_date: newDate })
diff --git a/frontend/src/components/Projects/ProjectList.jsx b/frontend/src/components/Projects/ProjectList.jsx
index f267c19..71fcd9c 100644
--- a/frontend/src/components/Projects/ProjectList.jsx
+++ b/frontend/src/components/Projects/ProjectList.jsx
@@ -4,6 +4,7 @@ import ProjectModal from './ProjectModal'
 import Button from '../UI/Button'
 import AgendaPanel from '../Calendar/AgendaPanel'
 import useProjectStore from '../../store/useProjectStore'
+import useUIStore from '../../store/useUIStore'
 
 const VIEW_OPTIONS = [
   { key: 'active',   label: 'Active'   },