diff --git a/frontend/src/layouts/IndexLayout.svelte b/frontend/src/layouts/IndexLayout.svelte
index 36ea160..3cca5cf 100644
--- a/frontend/src/layouts/IndexLayout.svelte
+++ b/frontend/src/layouts/IndexLayout.svelte
@@ -3,7 +3,10 @@
 <div class="wrapper">
   <Sidebar {userData} />
   <div class="super-container">
-    <LoadingScreen/>
+    <!-- TODO: Make this better :) -->
+    {#if currentRoute.component !== Index}
+      <LoadingScreen/>
+    {/if}
     <NotifyModal/>
     <div class="content-container" class:hide={$loadingScreen}>
       <Route {currentRoute} {params}/>
@@ -17,12 +20,10 @@
     import Sidebar from '../includes/Sidebar.svelte'
     import LoadingScreen from '../includes/LoadingScreen.svelte'
     import NotifyModal from '../includes/NotifyModal.svelte'
-    import axios from "axios";
-    import {API_URL} from '../js/constants'
-    import {notifyError} from '../js/util'
     import {loadingScreen} from "../js/stores"
     import {redirectLogin, setDefaultHeaders} from '../includes/Auth.svelte'
     import {onMount} from "svelte";
+    import Index from "../views/Index.svelte";
 
     export let currentRoute;
     export let params = {};
diff --git a/frontend/src/views/Index.svelte b/frontend/src/views/Index.svelte
index 54a9b1c..c0b2bb6 100644
--- a/frontend/src/views/Index.svelte
+++ b/frontend/src/views/Index.svelte
@@ -1,4 +1,4 @@
-<div class="content" transition:fade>
+<div class="content">
   <div class="card-wrapper">
     <Card footer={false} fill={false}>
       <span slot="title">
@@ -34,7 +34,7 @@
     import Card from '../components/Card.svelte'
     import InviteBadge from '../components/InviteBadge.svelte'
     import Button from '../components/Button.svelte'
-    import {permissionLevelCache} from "../js/stores";
+    import {loadingScreen, permissionLevelCache} from "../js/stores";
 
     setDefaultHeaders();
 
@@ -58,7 +58,7 @@
         });
     }
 
-    withLoadingScreen(() => {});
+    loadingScreen.set(false);
 </script>
 
 <style>