diff --git a/client/components/App.vue b/client/components/App.vue
index e4937629..9c62fdf6 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -7,6 +7,7 @@
 		</article>
 		<ImageViewer ref="imageViewer" />
 		<ContextMenu ref="contextMenu" />
+		<div id="upload-overlay"></div>
 	</div>
 </template>
 
diff --git a/client/index.html.tpl b/client/index.html.tpl
index 86fd1cd5..e66d5539 100644
--- a/client/index.html.tpl
+++ b/client/index.html.tpl
@@ -48,6 +48,7 @@
 
 	</head>
 	<body class="<%- public ? " public" : "" %>" data-transports="<%- JSON.stringify(transports) %>">
+		<div id="viewport"></div>
 		<div id="loading">
 			<div class="window">
 				<div id="loading-status-container">
@@ -59,13 +60,9 @@
 					<p id="loading-slow">This is taking longer than it should, there might be connectivity issues.</p>
 					<button id="loading-reload" class="btn">Reload page</button>
 				</div>
-				<script src="js/loading-error-handlers.js?v=<%- cacheBust %>"></script>
 			</div>
 		</div>
-		<div id="viewport"></div>
-
-		<div id="upload-overlay"></div>
-
+		<script src="js/loading-error-handlers.js?v=<%- cacheBust %>"></script>
 		<script src="js/bundle.vendor.js?v=<%- cacheBust %>"></script>
 		<script src="js/bundle.js?v=<%- cacheBust %>"></script>
 	</body>
diff --git a/client/themes/default.css b/client/themes/default.css
index cc2497ba..d8155503 100644
--- a/client/themes/default.css
+++ b/client/themes/default.css
@@ -17,10 +17,6 @@
 		padding: 0;
 	}
 
-	#viewport #sign-in {
-		margin-left: 0;
-	}
-
 	#footer .icon {
 		border-radius: 0;
 	}
