diff --git a/src/app/main/layout.tsx b/src/app/main/layout.tsx
index 38b1d2b..b6c72ab 100644
--- a/src/app/main/layout.tsx
+++ b/src/app/main/layout.tsx
@@ -828,7 +828,7 @@ export default function RootLayout ({
                           icon={
                             (popupMode == 0 &&
                               selectedGame &&
-                              pathname === '/') ||
+                              pathname === '/main') ||
                             viewingInfoFromDownloads ||
                             (popupMode == 3 && showModInfo) ||
                             popupMode == 4
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index fbde5cd..e70acf1 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -111,7 +111,7 @@ export default function Sidebar () {
                     : ''
                 } ml-auto w-50 ${
                   sidebarAlwaysShowGames ||
-                  pathname === '/' ||
+                  pathname === '/main' ||
                   pathname.startsWith('/main/game')
                     ? ''
                     : 'hidden'
@@ -164,7 +164,7 @@ export default function Sidebar () {
                         : ''
                     } ml-auto w-47.5 ${
                       sidebarAlwaysShowGames ||
-                      pathname === '/' ||
+                      pathname === '/main' ||
                       pathname.startsWith('/main/game')
                         ? ''
                         : 'hidden'
diff --git a/src/popups/GamesDownload.tsx b/src/popups/GamesDownload.tsx
index aed5dcf..ea92fe9 100644
--- a/src/popups/GamesDownload.tsx
+++ b/src/popups/GamesDownload.tsx
@@ -1,5 +1,8 @@
 import { useGlobal } from '@/providers/GlobalProvider'
-import { faDownload, faInfo } from '@fortawesome/free-solid-svg-icons'
+import {
+  faArrowUpRightFromSquare,
+  faInfo
+} from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 export default function GamesDownloadPopup () {
@@ -33,9 +36,9 @@ export default function GamesDownloadPopup () {
               <button
                 className='button btntheme3'
                 onClick={() => setSelectedGame(v.id)}
-                title='Click to download more versions of the game.'
+                title='Click to view more versions of the game.'
               >
-                <FontAwesomeIcon icon={faDownload} /> Download
+                <FontAwesomeIcon icon={faArrowUpRightFromSquare} /> View
               </button>
             </div>
           ))}
diff --git a/src/popups/ManageVersion.tsx b/src/popups/ManageVersion.tsx
index 26fad7e..3b8f559 100644
--- a/src/popups/ManageVersion.tsx
+++ b/src/popups/ManageVersion.tsx
@@ -41,7 +41,7 @@ export default function ManageVersionPopup () {
     })
   }, [managingVersion, setVersionSize, viewingInfoFromDownloads])
 
-  if (!managingVersion) return <></>
+  if (!managingVersion) return null
 
   const versionInfo = serverVersionList?.versions.find(
     vf => vf.id == managingVersion
diff --git a/src/popups/ModDownloads.tsx b/src/popups/ModDownloads.tsx
index 91f6838..43e8f76 100644
--- a/src/popups/ModDownloads.tsx
+++ b/src/popups/ModDownloads.tsx
@@ -60,7 +60,7 @@ export default function ModDownloadsPopup () {
     })()
   }, [managingVersion])
 
-  if (!managingVersion || !serverVersionList) return <></>
+  if (!managingVersion || !serverVersionList) return null
 
   const versionInfo = serverVersionList.versions.find(
     v => v.id == managingVersion
diff --git a/src/popups/VersionChangelog.tsx b/src/popups/VersionChangelog.tsx
index 4f3b8ec..2cd335a 100644
--- a/src/popups/VersionChangelog.tsx
+++ b/src/popups/VersionChangelog.tsx
@@ -6,7 +6,7 @@ import DOMPurify from 'dompurify'
 export default function VersionChangelogPopup () {
   const { serverVersionList, managingVersion } = useGlobal()
 
-  if (!managingVersion) return <></>
+  if (!managingVersion) return null
 
   const versionInfo = serverVersionList?.versions.find(
     vf => vf.id == managingVersion
diff --git a/src/popups/VersionsDownload.tsx b/src/popups/VersionsDownload.tsx
index 3860d59..b99c80f 100644
--- a/src/popups/VersionsDownload.tsx
+++ b/src/popups/VersionsDownload.tsx
@@ -17,13 +17,15 @@ export default function VersionsDownloadPopup () {
 
   const game = serverVersionList?.games.find(g => g.id === selectedGame)
 
-  if (!selectedGame || !game) return <></>
+  if (!selectedGame || !game) return null
+
+  const list = getSpecialVersionsList(selectedGame)
 
   return (
     <>
       <p className='text-xl text-center'>Select versions to download</p>
       <div className='popup-content'>
-        {getSpecialVersionsList(selectedGame).map((v, i) => (
+        {list.map((v, i) => (
           <div
             key={i}
             className='popup-entry grid items-center gap-3'
@@ -94,20 +96,18 @@ export default function VersionsDownloadPopup () {
         <button
           className='button btntheme1 w-fit mt-2 ml-2 -mb-4'
           onClick={() => {
-            const allIds = getSpecialVersionsList(selectedGame).map(v => v.id)
+            const allIds = list.map(v => v.id)
             setSelectedVersionList(prev =>
               prev.length === allIds.length ? [] : allIds
             )
           }}
           title={
-            selectedVersionList.length ===
-            getSpecialVersionsList(selectedGame).length
+            selectedVersionList.length === list.length
               ? 'Click to remove all selected versions for download.'
               : 'Click to add all selected versions for download.'
           }
         >
-          {selectedVersionList.length ===
-          getSpecialVersionsList(selectedGame).length
+          {selectedVersionList.length === list.length
             ? 'Deselect All'
             : 'Select All'}
         </button>