diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc
index 761ab54..cf1083a 100644
Binary files a/routes/__pycache__/main.cpython-313.pyc and b/routes/__pycache__/main.cpython-313.pyc differ
diff --git a/routes/__pycache__/room_files.cpython-313.pyc b/routes/__pycache__/room_files.cpython-313.pyc
index 89e16b8..d4ac50d 100644
Binary files a/routes/__pycache__/room_files.cpython-313.pyc and b/routes/__pycache__/room_files.cpython-313.pyc differ
diff --git a/routes/main.py b/routes/main.py
index 206733b..d13d07e 100644
--- a/routes/main.py
+++ b/routes/main.py
@@ -448,6 +448,11 @@ def init_routes(main_bp):
             
             # Get all users for filter dropdown
             users = User.query.order_by(User.username).all()
+        else:
+            events = None
+            total_pages = 0
+            current_page = 1
+            users = []
         
         # Create form for company settings
         company_form = CompanySettingsForm()
@@ -706,7 +711,7 @@ def init_routes(main_bp):
         date_range = request.args.get('date_range', '7d')
         user_id = request.args.get('user_id')
         page = request.args.get('page', 1, type=int)
-        per_page = 50
+        per_page = 10
         
         # Calculate date range
         end_date = datetime.utcnow()
diff --git a/templates/settings/settings.html b/templates/settings/settings.html
index 9662c52..d5c4dc0 100644
--- a/templates/settings/settings.html
+++ b/templates/settings/settings.html
@@ -73,7 +73,7 @@
 
                     <!-- Events Tab -->
                     <div class="tab-pane fade {% if active_tab == 'events' %}show active{% endif %}" id="events" role="tabpanel" aria-labelledby="events-tab">
-                        {{ events_tab(events, csrf_token, users) }}
+                        {{ events_tab(events, csrf_token, users, total_pages, current_page) }}
                     </div>
 
                     <!-- Debugging Tab -->
diff --git a/templates/settings/tabs/events.html b/templates/settings/tabs/events.html
index 7aa6528..d18a71c 100644
--- a/templates/settings/tabs/events.html
+++ b/templates/settings/tabs/events.html
@@ -1,4 +1,4 @@
-{% macro events_tab(events, csrf_token, users) %}
+{% macro events_tab(events, csrf_token, users, total_pages=0, current_page=1) %}
 <div class="card shadow-sm">
     <div class="card-body">
         <div class="d-flex justify-content-between align-items-center mb-4">
@@ -156,9 +156,21 @@
         
         <div class="d-flex justify-content-between align-items-center mt-3">
             <div>
-                <button id="prevPage" class="btn btn-outline-primary btn-sm" {% if current_page == 1 %}disabled{% endif %}>Previous</button>
+                <button id="prevPage" class="btn btn-outline-primary btn-sm" 
+                        style="border-color:var(--primary-color); color:var(--primary-color);" 
+                        onmouseover="this.style.backgroundColor='var(--primary-color)'; this.style.color='white'" 
+                        onmouseout="this.style.backgroundColor='transparent'; this.style.color='var(--primary-color)'"
+                        {% if current_page == 1 %}disabled{% endif %}>
+                    <i class="fas fa-chevron-left me-1"></i>Previous
+                </button>
                 <span class="mx-2">Page <span id="currentPage">{{ current_page }}</span> of <span id="totalPages">{{ total_pages }}</span></span>
-                <button id="nextPage" class="btn btn-outline-primary btn-sm" {% if current_page == total_pages %}disabled{% endif %}>Next</button>
+                <button id="nextPage" class="btn btn-outline-primary btn-sm"
+                        style="border-color:var(--primary-color); color:var(--primary-color);" 
+                        onmouseover="this.style.backgroundColor='var(--primary-color)'; this.style.color='white'" 
+                        onmouseout="this.style.backgroundColor='transparent'; this.style.color='var(--primary-color)'"
+                        {% if current_page == total_pages %}disabled{% endif %}>
+                    Next<i class="fas fa-chevron-right ms-1"></i>
+                </button>
             </div>
         </div>
     </div>