diff --git a/backend/src/index.js b/backend/src/index.js
index 2bebe807..8efd2a5c 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -32,6 +32,9 @@ configureAuth(app);
 // Serve static files from the React build
 app.use(express.static(path.join(__dirname, '../../frontend/build')));
 
+// Serve logos folder as static files
+app.use('/logos', express.static(path.join(__dirname, '../../frontend/logos')));
+
 // Bible data directories
 const ESV_DATA_DIR = path.join(__dirname, '../../bible-data'); // ESV from mdbible
 const NKJV_DATA_DIR = path.join(__dirname, '../../NKJV'); // NKJV local files
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 25b327fc..ef018c62 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -269,7 +269,8 @@ function App() {
 
     const handleBookSelect = (book: string) => {
       const urlName = getBookUrlName(book);
-      navigate(`/book/${urlName}`);
+      const url = selectedVersion ? `/book/${urlName}?version=${selectedVersion}` : `/book/${urlName}`;
+      navigate(url);
     };
 
     const handleFavoriteChange = () => {
@@ -426,7 +427,10 @@ function App() {
               {currentBook && (
                 <>
                   <button
-                    onClick={() => navigate('/')}
+                    onClick={() => {
+                      const url = selectedVersion ? `/?version=${selectedVersion}` : '/';
+                      navigate(url);
+                    }}
                     className="hover:text-blue-600 dark:hover:text-blue-400"
                   >
                     Books
@@ -439,7 +443,10 @@ function App() {
                     <>
                       <ChevronRight className="h-4 w-4" />
                       <button
-                        onClick={() => navigate(`/book/${currentBook}`)}
+                        onClick={() => {
+                          const url = selectedVersion ? `/book/${currentBook}?version=${selectedVersion}` : `/book/${currentBook}`;
+                          navigate(url);
+                        }}
                         className="hover:text-blue-600 dark:hover:text-blue-400"
                       >
                         Chapters