diff --git a/src/ui/app.ts b/src/ui/app.ts
index 9029c29..5028e85 100644
--- a/src/ui/app.ts
+++ b/src/ui/app.ts
@@ -117,8 +117,8 @@ export class App {
     const t = getTranslations(this.settings.language as LanguageCode);
     this.container.innerHTML = `
       <div class="app-container min-h-screen flex flex-col">
-        <header class="bg-navy text-parchment p-3 flex items-center justify-between shadow-md">
-          <nav class="flex flex-wrap gap-4 text-sm">
+        <header class="bg-navy text-parchment p-3 flex items-center shadow-md">
+          <nav class="flex flex-wrap gap-4 text-sm justify-end">
             <a href="#calendar" class="nav-link hover:text-gold transition-colors" data-view="calendar">${t.nav.calendar}</a>
             <details class="nav-group relative" data-nav="library">
               <summary class="cursor-pointer list-none hover:text-gold transition-colors flex items-center gap-1">${t.nav.library} <span class="text-xs">▾</span></summary>
@@ -135,7 +135,7 @@ export class App {
                 <a href="#triodion" class="nav-link hover:text-gold transition-colors px-2 py-1" data-view="triodion">${t.nav.triodion}</a>
               </div>
             </details>
-            <a href="#settings" class="nav-link hover:text-gold transition-colors ml-auto" data-view="settings">${t.nav.settings}</a>
+            <a href="#settings" class="nav-link hover:text-gold transition-colors" data-view="settings">${t.nav.settings}</a>
           </nav>
         </header>
         <main id="view-container" class="flex-1 overflow-auto"></main>
diff --git a/src/ui/calendar-view.ts b/src/ui/calendar-view.ts
index 93eeebe..d5d7b0f 100644
--- a/src/ui/calendar-view.ts
+++ b/src/ui/calendar-view.ts
@@ -570,7 +570,7 @@ export class CalendarView {
 
         </div>
 
-        <div class="flex-1 p-6 overflow-auto">
+        <div class="flex-1 p-4 overflow-auto">
           <div class="max-w-2xl lg:max-w-3xl xl:max-w-4xl">
             <h2 class="text-base font-bold text-red mb-1">
               ${julianStr}
@@ -581,22 +581,22 @@ export class CalendarView {
 
             <div id="day-title" class="mb-4"></div>
 
-            <div id="commemorations-panel" class="mb-4 p-4 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
+            <div id="commemorations-panel" class="mb-4 p-2 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
               <h3 class="font-bold text-red mb-2">${this.t.calendar.commemorations}</h3>
               <p class="text-sm text-navy-light italic">${this.t.loading}</p>
             </div>
 
-            <div id="fasting-panel" class="mb-4 p-4 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
+            <div id="fasting-panel" class="mb-4 p-2 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
               <h3 class="font-bold text-red mb-2">${this.t.calendar.fastingRule}</h3>
               <p class="text-sm italic text-navy-light">${this.t.loading}</p>
             </div>
 
-            <div id="readings-panel" class="mb-4 p-4 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
+            <div id="readings-panel" class="mb-4 p-2 bg-white/50 border border-gold/20 rounded-lg ${fnClass}">
               <h3 class="font-bold text-red mb-2">${this.t.calendar.readings}</h3>
               <p class="text-sm text-navy-light italic">${this.t.loading}</p>
             </div>
 
-            <div id="services-panel" class="mb-4 border-t border-gold/20 pt-6"></div>
+            <div id="services-panel" class="mb-4 border-t border-gold/20 pt-3"></div>
           </div>
         </div>
       </div>