diff --git a/views/style/sass/xos.scss b/views/style/sass/xos.scss
index 4ff10c7..a4d1f50 100644
--- a/views/style/sass/xos.scss
+++ b/views/style/sass/xos.scss
@@ -32,28 +32,18 @@
 }
 
 #wrap {
+  height: 100%;
   min-height: 100%;
   padding-bottom: 60px;
 }
 
-/* ************************* LOGIN PAGE ************************* */
-
-body.login img.logo{
-   width: 250px;
-   display: block;
-   margin: 20px auto;
-   padding-top: 20px;
-}
-
 /* ************************* SIDENAV TOGGLE ************************* */
 
 #wrapper {
     padding-left: 0;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
     transition: all 0.5s ease;
-    min-height: 900px;
+    min-height: 100%;
+    height: 100%;
 }
 
 #wrapper.toggled {
@@ -81,15 +71,21 @@
 }
 
 #page-content-wrapper {
-    width: 100%;
-    position: absolute;
-    padding: 15px;
-    min-height: 900px;
+  width: 100%;
+  position: absolute;
+  padding: 15px;
+  min-height: 100%;
+  height: 100%;
+  .container-fluid, 
+  .content-wrapper, 
+  .content-wrapper .col-lg-12, 
+  .suit-columns,
+  #content {
+    min-height: 100%;
+    height: 100%;
+  }
 }
 
-#page-content-wrapper .container-fluid {
-  min-height: 900px;
-}
 
 .ui-tabs-panel {
     min-height: 700px;