diff --git a/public/img/banner.png b/public/img/banner.png
new file mode 100644
index 0000000..f618ad3
Binary files /dev/null and b/public/img/banner.png differ
diff --git a/src/lib/common/ButtonClose.svelte b/src/lib/common/ButtonClose.svelte
index 3bc89e4..065754c 100644
--- a/src/lib/common/ButtonClose.svelte
+++ b/src/lib/common/ButtonClose.svelte
@@ -1,13 +1,12 @@
 <script>
-    import { invoke } from "@tauri-apps/api/tauri";
     import { appWindow } from "@tauri-apps/api/window";
 
-    function closeWindow() {
+    function handleClick() {
         appWindow.close();
     }
 </script>
 
-<button class="button-close" type="button" on:click={closeWindow}>
+<button class="button-close" type="button" on:click={handleClick}>
     <img class="icon" src="img/icon/icon-button-close.svg" alt="close">
 </button>
 
diff --git a/src/lib/login/loginmodal/LoginModal.svelte b/src/lib/login/loginmodal/LoginModal.svelte
index 89c06ab..e9cca94 100644
--- a/src/lib/login/loginmodal/LoginModal.svelte
+++ b/src/lib/login/loginmodal/LoginModal.svelte
@@ -7,49 +7,37 @@
 
     export let options;
 
-    let offlineUsername = "";
+    let offlineUsername;
+    let microsoftCode = null;
 
-    function handleOfflineLoginClick(e) {
+    async function handleOfflineLoginClick(e) {
         if (offlineUsername.length > 16 || offlineUsername.length < 1) {
             alert("Username must be between 1 and 16 characters long.");
             return;
         }
 
-        let usernameRegex = /^[a-zA-Z0-9_]+$/;
+        const usernameRegex = /^[a-zA-Z0-9_]+$/;
         if (!usernameRegex.test(offlineUsername)) {
             alert("Username can only contain letters, numbers, and underscores.");
             return;
         }
 
-        invoke("login_offline", { username: offlineUsername })
-            .then((accountData) => {
-                console.debug("login_offline", accountData)
-
-                options.currentAccount = accountData;
-                options.store();
-            })
-            .catch(e => console.error(e));
+        const accountData = await invoke("login_offline", { username: offlineUsername });
+        options.currentAccount = accountData;
+        options.store();
     }
 
-    function handleMicrosoftLoginClick(event) {
-        invoke("login_microsoft")
-            .then((account) => {
-                console.debug("microsoft authentication successful", account);
-
-                options.currentAccount = account;
-                options.store();
-            })
-            .catch(e => {
-                console.error("microsoft authentication error", e);
-                alert(e);
-            });
+    async function handleMicrosoftLoginClick(e) {
+        try {
+            const accountData = await invoke("login_microsoft");
+            options.currentAccount = accountData;
+            options.store();
+        } catch (err) {
+            alert(err);
+        }
     }
 
-    let microsoftCode;
-
     listen("microsoft_code", (e) => {
-        console.debug("microsoft_code", e.payload);
-
         microsoftCode = e.payload;
     });
 
@@ -63,7 +51,7 @@
 </script>
 
 <div class="modal">
-    {#if microsoftCode == null}
+    {#if !microsoftCode}
         <div class="title">Log in</div>
 
         <ModalInput placeholder="Username" icon="person" characterLimit={16} bind:value={offlineUsername} />
diff --git a/src/lib/login/loginmodal/ModalButton.svelte b/src/lib/login/loginmodal/ModalButton.svelte
index 963e62a..8ae2ead 100644
--- a/src/lib/login/loginmodal/ModalButton.svelte
+++ b/src/lib/login/loginmodal/ModalButton.svelte
@@ -1,7 +1,6 @@
 <script>
     import { createEventDispatcher } from "svelte";
 
-
     export let text;
     export let primary;
 
diff --git a/src/lib/main/Account.svelte b/src/lib/main/Account.svelte
index c6dc703..906d3f8 100644
--- a/src/lib/main/Account.svelte
+++ b/src/lib/main/Account.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <div class="account">
-    <object data="https://avatar.liquidbounce.net/avatar/{uuid}" type="image/png" class="avatar">
+    <object data="https://avatar.liquidbounce.net/avatar/{uuid}" type="image/png" class="avatar" aria-label="avatar">
         <img src="img/steve.png" alt=avatar class="avatar"/>
     </object>
     <div class="details">
diff --git a/src/lib/main/MainScreen.svelte b/src/lib/main/MainScreen.svelte
index 6e595b7..21f36a9 100644
--- a/src/lib/main/MainScreen.svelte
+++ b/src/lib/main/MainScreen.svelte
@@ -31,26 +31,44 @@
 
     const dispatch = createEventDispatcher();
 
+    let defaultDataFolder = "";
+
+    let settingsShown = false;
+    let versionSelectShown = false;
+    let clientLogShown = false;
+
+    let clientRunning = false;
+
     let versionInfo = {
-        bannerUrl: "https://liquidbounce.net/LiquidLauncher/img/b73.jpg",
+        bannerUrl: "img/banner.png", // TODO: placeholder image
         title: "Loading...",
         date: "Loading...",
         description: "Loading...",
     };
 
-    let settingsShown = false;
-    let versionSelectShown = false;
-    let clientLogShown = false;
+    let progressBar = {
+        max: 0,
+        value: 0,
+        text: ""
+    };
+    
+    let recommendedMods = [];
+    let customMods = [];
+    let branches = [];
+    let builds = [];
+    let currentBuild = {};
 
-    let log = [];
+    let launcherVersion = "";
 
-    let progressBarMax = 0;
-    let progressBarProgress = 0;
-    let progressBarLabel = "";
+    let additionalModsTitle = "";
+    $: {
+        additionalModsTitle = `Additional mods for ${currentBuild.branch} ${currentBuild.mcVersion}`;
+    }
 
-    let launcherVersion = "";
+    let log = [];
 
-    invoke("get_launcher_version").then(res => (launcherVersion = res));
+    invoke("get_launcher_version")
+        .then(res => (launcherVersion = res));
 
     listen("process-output", event => {
         log = [...log, event.payload];
@@ -60,25 +78,21 @@
         let progressUpdate = event.payload;
 
         switch (progressUpdate.type) {
-                case "max": {
-                    progressBarMax = progressUpdate.value;
-                    break;
-                }
-                case "progress": {
-                    progressBarProgress = progressUpdate.value;
-                    break;
-                }
-                case "label": {
-                    progressBarLabel = progressUpdate.value;
-                    break;
-                }
+            case "max": {
+                progressBar.max = progressUpdate.value;
+                break;
             }
+            case "progress": {
+                progressBar.value = progressUpdate.value;
+                break;
+            }
+            case "label": {
+                progressBar.text = progressUpdate.value;
+                break;
+            }
+        }
     });
 
-    let branches = [];
-
-    let builds = [];
-
     function getBuild() {
         if (options.preferredBuild === -1) { // -1 = latest
             // The find() method returns a value of the first element in the array that satisfies the provided testing function. Otherwise undefined is returned.
@@ -88,89 +102,97 @@
         return builds.find((build) => build.buildId === options.preferredBuild);
     }
 
-    let lbVersion = "";
-    let mcVersion = "";
-    let branch = "";
-
-    let additionalModsTitle = "";
+    function hideSettings() {
+        settingsShown = false;
+        options.store();
+    }
 
-    $: {
-        additionalModsTitle = `Additional mods for ${branch} ${mcVersion}`;
+    function hideVersionSelection() {
+        versionSelectShown = false;
+        options.store();
     }
 
-    let mods = [];
-    let customMods = [];
+    function updateModStates() {
+        const branchOptions = {
+            modStates: {},
+            customModStates: {}
+        };
+
+        for (const mod of recommendedMods) {
+            branchOptions.modStates[mod.name] = mod.enabled;
+        }
+
+        for (const mod of customMods) {
+            branchOptions.customModStates[mod.name] = mod.enabled;
+        }
+
+        options.branchOptions[options.preferredBranch] = branchOptions;
+        options.store();
+    }
 
     /// Request builds from API server
-    function requestBuilds() {
-        invoke("request_builds", { branch: options.preferredBranch })
-            .then(result => {
-                builds = result;
-
-                // Format date for user readability
-                builds.forEach(build => {
-                    let date = new Date(build.date);
-                    build.date = date.toLocaleString();
-                    build.dateDay = date.toLocaleDateString();
-                });
-
-                updateData();
-            })
-            .catch(e => console.error(e));
+    async function requestBuilds() {
+        const requestedBuilds = await invoke("request_builds", { branch: options.preferredBranch });
+        requestedBuilds.forEach(build => {
+            const date = new Date(build.date);
+            build.date = date.toLocaleString();
+            build.dateDay = date.toLocaleDateString();
+        });
+
+        builds = requestedBuilds;
+
+        await updateData();
     }
 
     /// Update build data
-    function updateData() {
-        let b = getBuild();
-        console.debug("Updating build data", b);
-
-        branch = b.branch;
-        lbVersion = b.lbVersion;
-        mcVersion = b.mcVersion;
+    async function updateData() {
+        currentBuild = getBuild();
 
         // Update changelog
-        invoke("fetch_changelog", { buildId: b.buildId })
-            .then(result => {
-                console.log("Fetched changelog data", result);
-                versionInfo = {
-                    bannerUrl: "https://liquidbounce.net/LiquidLauncher/img/b73.jpg",
-                    title: "LiquidBounce " + b.lbVersion + " for Minecraft " + b.mcVersion,
-                    date: b.dateDay,
-                    description: result.changelog,
-                };
-            })
-            .catch(e => console.error(e));
-
-        requestMods(b.branch, b.mcVersion, b.subsystem);
+        const changelog = await invoke("fetch_changelog", { buildId: currentBuild.buildId });
+        versionInfo = {
+            bannerUrl: "img/banner.png",
+            title: `LiquidBounce ${currentBuild.lbVersion} for Minecraft ${currentBuild.mcVersion}`,
+            date: currentBuild.dateDay,
+            description: changelog.changelog
+        };
+
+        requestMods();
     }
 
     /// Request mods from API server
-    function requestMods(branch, mcVersion, subsystem) {
+    async function requestMods() {
+        const { branch, mcVersion, subsystem } = currentBuild; 
         const branchOptions = options.branchOptions[branch];
 
-        invoke("request_mods", { branch, mcVersion, subsystem })
-            .then(result => {
-                mods = result;
-
-                if (branchOptions) {
-                    mods.forEach(mod => {
-                        mod.enabled = branchOptions.modStates[mod.name] ?? mod.enabled;
-                    });
-                }
-            })
-            .catch(e => console.error(e));
-
-        invoke("get_custom_mods", { branch, mcVersion })
-            .then(result => {
-                customMods = result;
-
-                if (branchOptions) {
-                    customMods.forEach(mod => {
-                        mod.enabled = branchOptions.customModStates[mod.name] ?? mod.enabled;
-                    });
-                }
-            })
-            .catch(e => console.error(e));
+        recommendedMods = await invoke("request_mods", { branch, mcVersion, subsystem });
+        customMods = await invoke("get_custom_mods", { branch, mcVersion });
+
+        if (branchOptions) {
+            recommendedMods = recommendedMods.map(mod => {
+                return { ...mod, enabled: branchOptions.modStates[mod.name] ?? mod.enabled };
+            });
+
+            customMods = customMods.map(mod => {
+                return { ...mod, enabled: branchOptions.customModStates[mod.name] ?? mod.enabled };
+            });
+        }
+    }
+
+    async function runClient() {
+        console.log("Client started");
+        log = [];
+        clientRunning = true;
+
+        let build = getBuild();
+        console.debug("Running build", build);
+
+        console.log([...recommendedMods, ...customMods])
+        await invoke("run_client", { buildId: build.buildId, accountData: options.currentAccount, options: options, mods: [...recommendedMods, ...customMods] });
+    }
+    
+    async function terminateClient() {
+        await invoke("terminate");
     }
 
     // Request branches from API server
@@ -190,68 +212,17 @@
         })
         .catch(e => console.error(e));
 
-    function hideSettings() {
-        settingsShown = false;
-        options.store();
-    }
-
-    function hideVersionSelection() {
-        versionSelectShown = false;
-        options.store();
-    }
-
-    let clientRunning = false;
-
-    async function runClient() {
-        console.log("Client started");
-        log = [];
-        clientRunning = true;
-
-        let build = getBuild();
-        console.debug("Running build", build);
-
-        console.log([...mods, ...customMods])
-        await invoke("run_client", { buildId: build.buildId, accountData: options.currentAccount, options: options, mods: [...mods, ...customMods] });
-    }
-
     listen("client-exited", () => {
         clientRunning = false;
     });
 
     listen("client-error", (e) => {
         const message = e.payload;
-
-        console.error(message);
         clientLogShown = true;
 
         alert(message);
     });
 
-    function updateModStates() {
-        const branchOptions = options.branchOptions[options.preferredBranch] ?? {
-            modStates: {},
-            customModStates: {}
-        };
-
-        branchOptions.modStates = mods.reduce(function(map, mod) {
-            map[mod.name] = mod.enabled;
-            return map;
-        }, {});
-
-        branchOptions.customModStates = customMods.reduce(function(map, mod) {
-            map[mod.name] = mod.enabled;
-            return map;
-        }, {});
-
-        console.log("Updated mod states", branchOptions);
-        options.branchOptions[options.preferredBranch] = branchOptions;
-        options.store();
-    }
-
-    async function terminateClient() {
-        await invoke("terminate");
-    }
-
     function clearData() {
         invoke("clear_data", { options }).then(() => {
             alert("Data cleared.");
@@ -261,24 +232,23 @@
         });
     }
 
-    let dataFolderPath;
     invoke("default_data_folder_path").then(result => {
-        dataFolderPath = result;
+        defaultDataFolder = result;
     }).catch(e => {
         alert("Failed to get data folder: " + e);
-        console.error(e)
+        console.error(e);
     });
 
     async function handleCustomModDelete(e) {
-        const { branch, mcVersion, subsystem } = getBuild();
+        const { branch, mcVersion } = currentBuild;
 
         await invoke("delete_custom_mod", { branch, mcVersion, modName: `${e.detail.name}.jar` });
 
-        requestMods(branch, mcVersion, subsystem);
+        requestMods();
     }
 
     async function handleInstallMod(e) {
-        const { branch, mcVersion, subsystem } = getBuild();
+        const { branch, mcVersion } = currentBuild;
 
         const selected = await dialogOpen({
             directory: false,
@@ -289,7 +259,7 @@
 
         if (selected) {
             await invoke("install_custom_mod", { branch, mcVersion, path: selected });
-            requestMods(branch, mcVersion, subsystem);
+            requestMods();
         }
     }
 </script>
@@ -301,7 +271,7 @@
 {#if settingsShown}
     <SettingsContainer title="Settings" on:hideSettings={hideSettings}>
         <FileSelectorSetting title="JVM Location" placeholder="Internal" bind:value={options.customJavaPath} filters={[{ name: "javaw", extensions: [] }]} windowTitle="Select custom Java wrapper" />
-        <DirectorySelectorSetting title="Data Location" placeholder={dataFolderPath} bind:value={options.customDataPath} windowTitle="Select custom data directory" />
+        <DirectorySelectorSetting title="Data Location" placeholder={defaultDataFolder} bind:value={options.customDataPath} windowTitle="Select custom data directory" />
         <RangeSetting title="Memory" min={20} max={100} bind:value={options.memoryPercentage} valueSuffix="%" step={1} />
         <RangeSetting title="Concurrent Downloads" min={1} max={50} bind:value={options.concurrentDownloads} valueSuffix="connections" step={1} />
         <ToggleSetting title="Keep launcher running" disabled={false} bind:value={options.keepLauncherOpen} />
@@ -317,7 +287,7 @@
         <SelectSetting title="Build" items={[{ value: -1, text: "Latest" }, ...builds.filter(e => e.release || options.showNightlyBuilds).map(e => ({ value: e.buildId, text: e.lbVersion + " git-" + e.commitId.substring(0, 7) + " - " + e.date }))]} bind:value={options.preferredBuild} on:change={updateData} />
         <ToggleSetting title="Show nightly builds" bind:value={options.showNightlyBuilds} disabled={false} on:change={updateData} />
         <SettingWrapper title="Recommended mods">
-            {#each mods as m}
+            {#each recommendedMods as m}
                 <ToggleSetting title={m.name} bind:value={m.enabled} disabled={m.required} on:change={updateModStates} />
             {/each}
         </SettingWrapper>
@@ -340,7 +310,7 @@
             {#if !clientRunning}
                 <TextStatus text="Welcome back, {options.currentAccount.name}." />
             {:else}
-                <ProgressStatus value={progressBarProgress} max={progressBarMax} text={progressBarLabel} />
+                <ProgressStatus {...progressBar} />
             {/if}
         </StatusBar>
         <Account username={options.currentAccount.name} uuid={options.currentAccount.uuid} accountType={options.currentAccount.type} on:showSettings={() => settingsShown = true} />
@@ -348,7 +318,7 @@
     </TitleBar>
 
     <ContentWrapper>
-        <LaunchArea {versionInfo} {lbVersion} {mcVersion} on:showVersionSelect={() => versionSelectShown = true} on:showClientLog={() => clientLogShown = true} on:launch={runClient} on:terminate={terminateClient} running={clientRunning} />
+        <LaunchArea {versionInfo} lbVersion={currentBuild.lbVersion} mcVersion={currentBuild.mcVersion} on:showVersionSelect={() => versionSelectShown = true} on:showClientLog={() => clientLogShown = true} on:launch={runClient} on:terminate={terminateClient} running={clientRunning} />
         <NewsArea />
     </ContentWrapper>
 </VerticalFlexWrapper>
diff --git a/src/lib/main/news/News.svelte b/src/lib/main/news/News.svelte
index b97172d..ee7b6a8 100644
--- a/src/lib/main/news/News.svelte
+++ b/src/lib/main/news/News.svelte
@@ -8,7 +8,7 @@
     export let url;
     export let description;
 
-    function handleClick() {
+    function handleShowNews(e) {
         invoke("open_url", { url: url });
     }
 </script>
@@ -23,7 +23,7 @@
             <div class="date">{new Date(date).toLocaleDateString()}</div>
         </div>
         <div class="description">{description}</div>
-        <button class="button-show-news" type="button" on:click={handleClick}>Read more</button>
+        <button class="button-show-news" type="button" on:click={handleShowNews}>Read more</button>
     </div>
 </div>
 
diff --git a/src/lib/main/news/NewsArea.svelte b/src/lib/main/news/NewsArea.svelte
index 9679c23..6c8321f 100644
--- a/src/lib/main/news/NewsArea.svelte
+++ b/src/lib/main/news/NewsArea.svelte
@@ -1,15 +1,15 @@
 <script>
     import SocialBar from "../../common/social/SocialBar.svelte";
     import News from "./News.svelte";
-    import {invoke} from "@tauri-apps/api/tauri";
+    import { invoke } from "@tauri-apps/api/tauri";
 
-    let news = []
+    let news = [];
 
     invoke("fetch_news")
         .then((onlineNews) => {
             news = onlineNews;
         })
-        .catch(e => console.error(e));
+        .catch((e) => console.error(e));
 </script>
 
 <div class="news-area">
@@ -20,7 +20,7 @@
     </div>
 
     <button class="button-scroll">
-        <img class="icon" src="img/icon/icon-news-scroll.svg" alt="scroll">
+        <img class="icon" src="img/icon/icon-news-scroll.svg" alt="scroll" />
     </button>
 
     <div class="social-bar-wrapper">
diff --git a/src/lib/main/statusbar/ProgressStatus.svelte b/src/lib/main/statusbar/ProgressStatus.svelte
index 3ef1094..66c1a80 100644
--- a/src/lib/main/statusbar/ProgressStatus.svelte
+++ b/src/lib/main/statusbar/ProgressStatus.svelte
@@ -25,7 +25,7 @@
     }
 
     .progress::-webkit-progress-value {
-        background-color: #4677FF;
+        background-color: #4677ff;
     }
 
     .text {
@@ -39,4 +39,4 @@
         overflow: hidden;
         white-space: nowrap;
     }
-</style>
\ No newline at end of file
+</style>