4 files changed, 13 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 7c92bcf74..26dd784f0 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -152,7 +152,7 @@ class App extends Component {
 
         h(AccountMenu),
 
-        h('div.main-container', [
+        h('div.main-container-wrapper', [
           (isLoading || isLoadingNetwork) && h(Loading, {
             loadingMessage: loadMessage,
           }),
diff --git a/ui/app/components/pages/unlock-page/index.scss b/ui/app/components/pages/unlock-page/index.scss
index 3d44bd037..6bd52282d 100644
--- a/ui/app/components/pages/unlock-page/index.scss
+++ b/ui/app/components/pages/unlock-page/index.scss
@@ -14,6 +14,7 @@
     align-self: stretch;
     justify-content: center;
     flex: 1 0 auto;
+    height: 100vh;
   }
 
   &__mascot-container {
diff --git a/ui/app/css/itcss/components/loading-overlay.scss b/ui/app/css/itcss/components/loading-overlay.scss
index 17f12ab73..b023c8423 100644
--- a/ui/app/css/itcss/components/loading-overlay.scss
+++ b/ui/app/css/itcss/components/loading-overlay.scss
@@ -1,6 +1,6 @@
 .loading-overlay {
   left: 0;
-  z-index: 256;
+  z-index: 51;
   position: absolute;
   flex-direction: column;
   display: flex;
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index 7eb193d6f..8e963d495 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -22,6 +22,12 @@ $wallet-view-bg: $alabaster;
   display: none;
 }
 
+.main-container-wrapper {
+  display: flex;
+  width: 100vw;
+  justify-content: center;
+}
+
 //Account and transaction details
 .account-and-transaction-details {
   display: flex;
@@ -219,6 +225,10 @@ $wallet-view-bg: $alabaster;
     overflow-y: auto;
     background-color: $white;
   }
+
+  .main-container-wrapper {
+    height: 100%;
+  }
 }
 
 // wallet view