diff --git a/site/assets/scss/yuzu/yuzu.scss b/site/assets/scss/yuzu/yuzu.scss
index d673f49d..1973700d 100644
--- a/site/assets/scss/yuzu/yuzu.scss
+++ b/site/assets/scss/yuzu/yuzu.scss
@@ -98,6 +98,10 @@ a:hover {
   display: block !important;
 }
 
+.show-with-js {
+  display: none;
+}
+
 // Make text nicer to read in articles
 .section.content.pt-sm > p {
   text-align: justify;
@@ -135,12 +139,36 @@ pre > code {
   box-shadow: 0 1px 1px rgba(0,0,0,0.125);
 }
 
-// Workaround for browsers without JavaScript for the downloads page
-#install-view, #manual-package-view {
+#download-header {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+}
+
+#download-buttons > a {
+  margin-top: 0.75rem;
+  margin-bottom: 0.75rem;
+}
+
+@media screen and (min-width: 780px) {
+  #download-header {
+    flex-direction: row;
+    text-align: left;
+    align-items: center;
+  }
+
+  #download-buttons > a {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+}
+
+#unsupported-platform-view {
   display: none;
 }
 
-.dl-button, #platform-unsupported {
+// Workaround for browsers without JavaScript for the downloads page
+#install-view, #manual-package-view {
   display: none;
 }
 
diff --git a/site/content/downloads.md b/site/content/downloads.md
index 7a381cbe..1fe6f07e 100644
--- a/site/content/downloads.md
+++ b/site/content/downloads.md
@@ -4,29 +4,29 @@ layout: "downloads"
 FullWidth: true
 ---
 
-
-
-## Windows
-
+<div class="tab-content" id="tab-windows">
+<h2 class="hide-with-js mt-5">Windows Instructions</h2>
 <article class="message has-text-weight-semibold">
 <div class="message-body">
 <p style="color:cyan;margin-bottom: 0px;">yuzu requires the latest versions of Microsoft Visual C++. 
- Please download and install the dependency from below.</p>
+Please download and install the dependency from below.</p>
 <a href="https://aka.ms/vs/17/release/vc_redist.x64.exe">Download Microsoft Visual C++ 2022 here!</a>
 </div>
 </article>
 
-#### Windows Installer
+<h4>Windows Installer</h4>
 
 The installer will allow you to download your preferred release channel. 
 
 If you are a Patreon subscriber, the "Early Access" channel will be available to you, and will provide early access to exciting experimental changes on top of what is available in the main channel. Please follow our [Early Access guide](https://yuzu-emu.org/help/early-access/) for assistance linking your Patreon account.
 
 Intel and AMD users are strongly recommended to switch to Vulkan by going to `Emulation > Configure > Graphics > API`. Latest GPU drivers are recommended.
+</div>
 
-## Linux
 
-<link href="//cdn.jsdelivr.net/npm/font-logos@0.18/assets/font-logos.css" rel="stylesheet">
+
+<div class="tab-content" id="tab-linux">
+<h2 class="hide-with-js mt-5">Linux Instructions</h2>
 <article class="message has-text-weight-semibold">
 <div class="message-body">
 <p style="color:cyan;margin-bottom: 0px;">We have yuzu as an AppImage and Flatpak now! This relaxes dependency requirements for yuzu, as well as enabling it to run on a lot of older distributions.</p>
@@ -42,3 +42,4 @@ chmod a+x yuzu-*.AppImage
 ```
 
 Or with the GUI, right click the AppImage, click Properties, then Permissions, then click "Allow this file to run as a program". After that, double-click the AppImage to run it.
+</div>
diff --git a/site/layouts/page/downloads.html b/site/layouts/page/downloads.html
index ec3ae233..783855b3 100644
--- a/site/layouts/page/downloads.html
+++ b/site/layouts/page/downloads.html
@@ -1,54 +1,83 @@
 {{ define "header" }}
-<section class="section">
-    <div class="container">
-        <h1 class="title">{{ .Title }}</h1>
-	<div class="content">
-	    {{ .Content }}
-	</div>
-</section>
+<link href="//cdn.jsdelivr.net/npm/font-logos@0.18/assets/font-logos.css" rel="stylesheet">
 
 <section class="section">
     <div class="container">
-        <div id="no-js-view">
-            Hi! We see that you have JavaScript disabled. We can't show you an
-            updated listing of the available packages for yuzu, nor alternative
-            installation methods, but here are a few links to get you started: <br />
-            <a href="https://github.com/yuzu-emu/liftinstall/releases/download/1.9/yuzu_install.exe">Windows x64 Installer</a><br />
-            <a href="https://github.com/yuzu-emu/yuzu-mainline/releases">Mainline releases on GitHub</a>
+        <div class="mb-3" id="download-header">
+            <h1 class="title is-flex-grow-1 mb-0">{{ .Title }}</h1>
+            <div id="download-buttons">
+                <a href="https://github.com/yuzu-emu/liftinstall/releases/download/1.9/yuzu_install.exe" class="button dl-button is-medium is-success" id="dl-button-windows">
+                    <span class="icon mr-1"><i class="fab fa-windows"></i></span> Download for Windows x64
+                </a>
+                <a href="https://github.com/yuzu-emu/liftinstall/releases/download/1.9/liftinstall-31b3e7e.tar.xz" class="button dl-button is-medium is-success" id="dl-button-linux">
+                    <span class="icon mr-1"><i class="fab fa-linux"></i></span> Download for Linux x64
+                </a>
+            </div>
         </div>
-        <div id="install-view">
+
+        <div id="unsupported-platform-view">
             <article class="message is-danger" id="platform-unsupported">
-                <div class="message-body has-text-white">
-                    yuzu doesn't support your platform. If you are running Windows x64 or Linux x64 however,
-                    choose one of the options below.
+                <div class="message-body has-text-white my-5">
+                    Currently, yuzu doesn't support your platform. If you are running Windows x64 or Linux x64 however,
+                    choose one of the options above.
                 </div>
             </article>
+        </div>
 
-            <div class="buttons is-centered">
-                <a href="https://github.com/yuzu-emu/liftinstall/releases/download/1.9/yuzu_install.exe" class="button dl-button is-medium is-success" id="dl-button-windows">Download for Windows x64</a>
-                <a href="https://github.com/yuzu-emu/liftinstall/releases/download/1.9/liftinstall-31b3e7e.tar.xz" class="button dl-button is-medium is-success" id="dl-button-linux">Download for Linux x64</a>
+        <div class="show-with-js">
+            <div class="tabs " id="platform-switcher">
+                <ul>
+                    <li data-target="tab-windows">
+                        <a>
+                            <span class="icon is-small"><i class="fab fa-windows"></i></span>
+                            <span>Windows</span>
+                        </a>
+                    </li>
+                    <li data-target="tab-linux">
+                        <a>
+                            <span class="icon is-small"><i class="fab fa-linux"></i></span>
+                            <span>Linux</span>
+                        </a>
+                    </li>
+                </ul>
             </div>
 
-            <div class="buttons is-centered">
-                <!-- Show this when Flatpak/other primary installation methods are provided for Linux/Mac.
-                <a class="button">
-                    Other platforms
-                </a>
-                -->
-                <a class="button" id="view-package-listing-button">
-                    Manual Download
-                </a>
+            <div class="content">
+                <h2>Instructions</h2>
             </div>
         </div>
-        <div class="columns" id="manual-package-view">
+
+        <div class="content" id="platform-instructions">
+            {{ .Content }}
+        </div>
+    </div>
+</section>
+
+<section class="section pt-0">
+    <div class="container">
+        <div class="hide-with-js content">
+            <h2>Builds</h2>
+
+            <article class="message is-warn">
+                <div class="message-body has-text-white mb-6">
+                    Hi! We see that you have JavaScript disabled. You can still use the 
+                    above download links but we can't show you an updated listing of the available 
+                    packages for yuzu, nor alternative installation methods, but we recommend 
+                    viewing the 
+                    <a href="https://github.com/yuzu-emu/yuzu-mainline/releases">Mainline releases on GitHub</a>
+                </div>
+            </article>
+        </div>
+        
+        <div class="show-with-js" id="package-view">
             <!-- Mainline -->
-            <div class="column">
-                <h3>Builds
-                    <span style='font-size: smaller; margin-left: 6px;'>
-                        Last release was
+            <div class="content">
+                <h2>Builds
+                    <span class="tag is-info">
+                        Last release was &nbsp;
                         <span id='last-updated-mainline'></span>
                     </span>
-                </h3>
+                </h2>
 
                 <div id="downloads-mainline">
                 </div>
@@ -62,7 +91,7 @@
             </div>
         </div>
 	</div>
- </section>
+</section>
 
 <!-- Advertisement -->
 <section class="hero is-info">
@@ -76,56 +105,78 @@
 
 {{ define "scripts" }}
 <script type="text/javascript">
-    function fetchReleases() {
-        getRelease('mainline');
+    const setTabActive = (targetId) => {
+        document.querySelectorAll(".content .tab-content")
+            .forEach(element => element.style.display = "none");
+
+        document.querySelectorAll(`#${targetId}`)    
+            .forEach(element => element.style.display = "block");
+
+        document.querySelectorAll(".tabs li")    
+            .forEach(element => element.classList.remove('is-active'));
+
+        document.querySelectorAll(`[data-target="${targetId}"]`)    
+            .forEach(element => element.classList.add('is-active'));
     }
 
-    fetchReleases();
+    const getOSGuess = () => {
+        const userAgent = navigator.userAgent.toLowerCase();
+
+        if (userAgent.includes("windows")) {
+            return "Windows";
+        } else if (
+            userAgent.includes("mac") && 
+            !userAgent.includes("mobile") && 
+            !userAgent.includes("phone")
+        ) {
+            return "Mac";
+        } else if (
+            userAgent.includes("linux") && 
+            userAgent.includes("android")
+        ) {
+            return "Linux";
+        }
+
+        return "Other";
+    }
+
+    const setupListeners = () => {
+        document.querySelectorAll(".tabs li")
+            .forEach(element => 
+                element.addEventListener('click', (event) => {
+                    setTabActive(element.dataset.target);
+                })
+            );
+    }
+
+    getRelease('mainline');
+
+    // Show JS relevant elements
+    document.querySelectorAll(".hide-with-js")
+        .forEach(element => element.style.display = "none");
+
+    document.querySelectorAll(".show-with-js")
+        .forEach(element => element.style.display = "block");
+    
+    document.querySelectorAll(".content .tab-content")
+        .forEach(element => element.style.display = "none");
 
     // Attempt autodetection of their operating system
-    var userAgent = navigator.userAgent.toLowerCase();
-
-    var allPlatforms = ["windows", "mac", "linux"];
-
-    var os = "Other";
-    if (userAgent.indexOf("windows") !== -1) {
-        os = "Windows";
-    } else if (userAgent.indexOf("mac") !== -1 && userAgent.indexOf("mobile") === -1 && userAgent.indexOf("phone") === -1) {
-        os = "Mac";
-    } else if (userAgent.indexOf("linux") !== -1 && userAgent.indexOf("android") === -1) {
-        os = "Linux";
+    switch (getOSGuess()) {
+        case "Windows":
+            document.getElementById("dl-button-linux").style.display = "none";
+            setTabActive('tab-windows');
+            break;
+        case "Linux":
+            document.getElementById("dl-button-windows").style.display = "none";
+            setTabActive('tab-linux');
+            break;
+        default:
+            document.getElementById("unsupported-platform-view").style.display = "block";
+            setTabActive('tab-windows');
+            break
     }
 
-    // Configure the views for this platform
-    document.getElementById("no-js-view").style.display = "none";
-
-    var platformButton = document.getElementById("dl-button-" + os.toLowerCase());
-    if (platformButton !== null) {
-        platformButton.style.display = "block";
-    } else {
-        document.getElementById("platform-unsupported").style.display = "block";
-    }
-
-    // Installer is not available on all platforms
-    if (os === "Mac") {
-        document.getElementById("install-view").style.display = "none";
-        document.getElementById("manual-package-view").style.display = "flex";
-    } else {
-        document.getElementById("install-view").style.display = "block";
-        document.getElementById("manual-package-view").style.display = "none";
-    }
-    if (os === "Linux") {
-        document.getElementById("dl-button-linux").style.display = "block";
-        document.getElementById("dl-button-windows").style.display = "none";
-    } else if (os === "Windows") {
-        document.getElementById("dl-button-windows").style.display = "block";
-        document.getElementById("dl-button-linux").style.display = "none";
-    }
-
-    document.getElementById("view-package-listing-button").addEventListener("click", function() {
-        this.style.display = "none";
-        document.getElementById("manual-package-view").style.display = "flex";
-    });
-
+    window.addEventListener('DOMContentLoaded', setupListeners);
 </script>
 {{ end }}