diff --git a/app/routes/auth.py b/app/routes/auth.py
index 47d779e..cc8e40d 100644
--- a/app/routes/auth.py
+++ b/app/routes/auth.py
@@ -28,11 +28,13 @@ def login():
             login_user(user)
             flash(f'Welcome back, {user.username}!', 'success')
 
-            # Redirect based on role
-            if user.role == 'administrator':
-                return redirect(url_for('admin.dashboard'))
-            elif user.role == 'product_owner':
-                return redirect(url_for('dashboard.list'))
+            # TODO: Redirect based on role when dashboards are implemented
+            # For now, redirect to index page
+            # if user.role == 'administrator':
+            #     return redirect(url_for('admin.dashboard'))
+            # elif user.role == 'product_owner':
+            #     return redirect(url_for('dashboard.list'))
+            return redirect(url_for('index'))
         else:
             flash('Invalid username or password', 'error')
 
@@ -45,4 +47,4 @@ def logout():
     """User logout"""
     logout_user()
     flash('You have been logged out', 'info')
-    return redirect(url_for('submission.form'))
+    return redirect(url_for('index'))
diff --git a/app/templates/base.html b/app/templates/base.html
index 2f85d42..c6e3fb9 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -189,13 +189,11 @@
     <div class="container">
         {% if current_user and current_user.is_authenticated %}
         <div class="nav">
+            <a href="{{ url_for('index') }}">Home</a>
             {% if current_user.role == 'product_owner' %}
-                <a href="{{ url_for('dashboard.list') }}">Dashboard</a>
-                <a href="{{ url_for('dashboard.products') }}">Products</a>
+                <span style="color: #999;">(Dashboard - Coming in Phase 5)</span>
             {% elif current_user.role == 'administrator' %}
-                <a href="{{ url_for('admin.dashboard') }}">Admin Dashboard</a>
-                <a href="{{ url_for('admin.users') }}">Users</a>
-                <a href="{{ url_for('admin.products') }}">Products</a>
+                <span style="color: #999;">(Admin Panel - Coming in Phase 6)</span>
             {% endif %}
             <a href="{{ url_for('auth.logout') }}" style="float: right;">Logout ({{ current_user.username }})</a>
         </div>