diff --git a/client/modules/App/components/loader.jsx b/client/modules/App/components/loader.jsx
index 1561387e..37306427 100644
--- a/client/modules/App/components/loader.jsx
+++ b/client/modules/App/components/loader.jsx
@@ -1,9 +1,11 @@
 import React from 'react';
 
 const Loader = () => (
-  <div className="loader">
-    <div className="loader__circle1" />
-    <div className="loader__circle2" />
+  <div className="loader-container">
+    <div className="loader">
+      <div className="loader__circle1" />
+      <div className="loader__circle2" />
+    </div>
   </div>
 );
 export default Loader;
diff --git a/client/styles/components/_asset-list.scss b/client/styles/components/_asset-list.scss
index 0a34f343..335fc7bf 100644
--- a/client/styles/components/_asset-list.scss
+++ b/client/styles/components/_asset-list.scss
@@ -1,7 +1,7 @@
 .asset-table-container {
   overflow-y: auto;
   max-width: 100%;
-  min-height: #{400 / $base-font-size}rem;
+  min-height: 100%;
 }
 
 .asset-table {
diff --git a/client/styles/components/_loader.scss b/client/styles/components/_loader.scss
index ec52410a..b9f2a05c 100644
--- a/client/styles/components/_loader.scss
+++ b/client/styles/components/_loader.scss
@@ -1,9 +1,17 @@
+.loader-container {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+
 .loader {
 	width: #{80 / $base-font-size }rem;
 	height: #{80 /  $base-font-size}rem;
 
 	position: relative;
-	margin: #{100 /  $base-font-size}rem auto;
 }
 
 .loader__circle1,
diff --git a/client/styles/components/_sketch-list.scss b/client/styles/components/_sketch-list.scss
index 76d456ab..87162305 100644
--- a/client/styles/components/_sketch-list.scss
+++ b/client/styles/components/_sketch-list.scss
@@ -1,7 +1,7 @@
 .sketches-table-container {
   overflow-y: auto;
   max-width: 100%;
-  min-height: #{400 / $base-font-size}rem;
+  min-height: 100%;
 }
 
 .sketches-table {