diff --git a/messages/messages.css b/messages/messages.css
index 6f99111..507f336 100644
--- a/messages/messages.css
+++ b/messages/messages.css
@@ -128,16 +128,23 @@ body {
     padding: 10px 12px;
     max-width: 100%;
   }
-  .bulk-actions-left,
+  .bulk-actions-left {
+    justify-content: space-between;
+    flex-wrap: nowrap;
+    gap: 6px;
+    order: 1;
+  }
   .bulk-actions-right {
-    justify-content: center;
+    justify-content: space-between;
     flex-wrap: wrap;
     gap: 6px;
+    order: 2;
   }
   .bulk-btn,
   .view-toggle button {
     width: 32px;
     height: 32px;
+    flex: 1;
   }
   .bulk-btn img,
   .view-toggle button img {
@@ -151,12 +158,19 @@ body {
   .view-toggle button {
     width: 28px;
     height: 28px;
+    flex: 1;
   }
   .bulk-btn img,
   .view-toggle button img {
     width: 16px;
     height: 16px;
   }
+  .bulk-actions-left {
+    order: 1;
+  }
+  .bulk-actions-right {
+    order: 2;
+  }
 }
 
 .messages-grid {
diff --git a/timetable/timetable.js b/timetable/timetable.js
index 4137c23..8a3368a 100644
--- a/timetable/timetable.js
+++ b/timetable/timetable.js
@@ -1982,8 +1982,10 @@
 
       dayNavigationState.currentDayIndex = currentDayIndex;
     } else {
-      const preservedDayIndex = dayNavigationState.currentDayIndex;
-      dayNavigationState.currentDayIndex = preservedDayIndex;
+      if (dayNavigationState.currentDayIndex >= 0 && dayNavigationState.currentDayIndex < 5) {
+      } else {
+        dayNavigationState.currentDayIndex = 0;
+      }
     }
 
     function updateDayDisplay() {
@@ -2643,6 +2645,7 @@
         timetableContainer.appendChild(tempDiv.firstChild);
       }
       setupLessonCardListeners();
+      setupDayNavigation(weekDates);
       
       setTimeout(async () => {
         await updateHomeworkIconsFromCookie();