diff --git a/views/style/sass/lib/login.scss b/views/style/sass/lib/login.scss
index 4cd970f..f18abc6 100644
--- a/views/style/sass/lib/login.scss
+++ b/views/style/sass/lib/login.scss
@@ -1,3 +1,10 @@
+body.login img.logo{
+   width: 250px;
+   display: block;
+   margin: 20px auto;
+   padding-top: 20px;
+}
+
 .login{
   #content-main {
     background: rgba(255,255,255,0.82);
@@ -8,18 +15,19 @@
   .requestDialog.ui-widget input{
     background-color: rgb(250, 255, 189);
   }
-  //#forgot_pwd{
-  //  font-size: 11px;
-  //  font-style: normal;
-  //  text-decoration: none;
-  //}
-  //
-  //#create_acct{
-  //  font-size: 11px;
-  //  font-style: normal;
-  //  text-decoration: none;
-  //  padding-left: 45px;
-  //}
+  
+  /*#forgot_pwd{
+    font-size: 11px;
+    font-style: normal;
+    text-decoration: none;
+  }
+  
+  #create_acct{
+    font-size: 11px;
+    font-style: normal;
+    text-decoration: none;
+    padding-left: 45px;
+  }*/
 
   .row + .row {
     margin-top: 10px;
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;