diff --git a/src/app.js b/src/app.js
index a199904..9507962 100644
--- a/src/app.js
+++ b/src/app.js
@@ -404,6 +404,9 @@ function initializeModules() {
 		// Use the new renderModuleList function with both callbacks
 		renderModuleList(elements.moduleList, modules, selectModule, selectLesson);
 
+		// Render footer lesson links (for all pages)
+		renderFooterLessonLinks();
+
 		// Handle route (home, section, or lesson)
 		handleRoute(false);
 
@@ -2031,7 +2034,6 @@ function updateSectionColor(sectionId) {
 function showLandingPage() {
 	hideAllPages();
 	elements.landingPage?.classList.remove("hidden");
-	window.scrollTo(0, 0);
 
 	// Reset section color on landing page
 	updateSectionColor(null);
@@ -2041,6 +2043,9 @@ function showLandingPage() {
 
 	// Render footer lesson links
 	renderFooterLessonLinks();
+
+	// Scroll to top after content is rendered
+	requestAnimationFrame(() => window.scrollTo(0, 0));
 }
 
 /**
@@ -2166,7 +2171,6 @@ function showSectionPage(sectionId) {
 function showReferencePage(refId) {
 	hideAllPages();
 	elements.referencePage?.classList.remove("hidden");
-	window.scrollTo(0, 0);
 
 	// Default to CSS if no refId
 	const activeRef = refId || "css";
@@ -2194,6 +2198,9 @@ function showReferencePage(refId) {
 	} else if (elements.referenceBody) {
 		elements.referenceBody.innerHTML = `<p>Reference for "${activeRef}" coming soon...</p>`;
 	}
+
+	// Scroll to top after content is rendered
+	requestAnimationFrame(() => window.scrollTo(0, 0));
 }
 
 /**
diff --git a/src/index.html b/src/index.html
index 3492971..669bf95 100644
--- a/src/index.html
+++ b/src/index.html
@@ -342,6 +342,7 @@
 								<label for="code-input" class="editor-label" data-i18n="editorLabel">CSS Editor</label>
 								<div class="editor-actions">
 									<div class="editor-tools">
+										<button id="random-template-btn" class="btn btn-icon hidden" title="Load random template"><img src="./dice.svg" alt="" /></button>
 										<button id="undo-btn" class="btn btn-icon" data-i18n-title="undoTitle" title="Undo (Ctrl+Z)">↶</button>
 										<button id="redo-btn" class="btn btn-icon" data-i18n-title="redoTitle" title="Redo (Ctrl+Shift+Z)">↷</button>
 										<button
@@ -352,7 +353,6 @@
 										>
 											⟲
 										</button>
-										<button id="random-template-btn" class="btn btn-icon hidden" title="Load random template"><img src="./dice.svg" alt="" /></button>
 									</div>
 									<button id="run-btn" class="btn btn-run"><img src="./gear.svg" alt="" /><span data-i18n="run">Run</span></button>
 								</div>