diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index b91c15d8910..ced3769af0a 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -1,15 +1,21 @@
 html {
   overflow-y: scroll;
+  height: 100%;
+  margin: 0;
 
   &.touch .tooltip { display: none !important; }
 
   body {
     padding-top: $header-height;
+    height: 100%;
+    margin: 0;
   }
 }
 
 .container {
   padding-top: 0;
+  height: 100%;
+  width: 100%;
   z-index: 5;
 }
 
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
index cf76f538e01..a5fe5890447 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -94,6 +94,7 @@ body {
 
 @mixin btn-info {
   @include border-radius(2px);
+  @include transition (all 0.2s ease 0s);
   
   border-width: 1px;
   border-style: solid;
@@ -116,6 +117,7 @@ body {
   
   &:active {
     @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
+    
     border-width: 1px;
     border-style: solid;
   }
@@ -123,6 +125,7 @@ body {
 
 @mixin btn-middle {
   @include border-radius(2px);
+  @include transition (all 0.2s ease 0s);
   
   border-width: 1px;
   border-style: solid;
@@ -145,6 +148,7 @@ body {
   
   &:active {
     @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
+    
     border-width: 1px;
     border-style: solid;
     }
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index e3a5b7ad65e..d30fc6e189d 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -1,4 +1,7 @@
 .page-with-sidebar {
+  min-height: 100%;
+  height: 100%;
+  
   .sidebar-wrapper {
     position: fixed;
     top: 0;
@@ -40,43 +43,6 @@
   }
 }
 
-
-.content {
-  height: 100%;
-  width: 100%;
-  
-}
-
-.max_height {
-  height: 100%;
-  display: table;
-  width: 100%;
-}
-
-.project-show-readme {
-  height: 100%;
-  display: table-row;
-}
-
-.wiki {
-  min-width: 1167px;
-}
-
-section {
-  height: 100%;
-  display: table-row;
-}
-
-html, body {
-  height: 100%;
-  margin: 0;
-}
-
-.page-with-sidebar{
-  min-height: 100%;
-  height: 100%;
-}
-
 .nav-sidebar {
   margin-top: 14 + $header-height;
   margin-bottom: 100px;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index a5940543a9d..c1505b9a62f 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -505,3 +505,19 @@ pre.light-well {
   display: inline-block;
 }
 
+.content {
+  height: 100%;
+  width: 100%;
+  
+}
+
+.max-height {
+  height: 100%;
+  display: table;
+  width: 100%;
+}
+
+section {
+  height: 100%;
+  display: table-row;
+}
\ No newline at end of file
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 95a6267e2eb..1f4ade81ed2 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -25,5 +25,5 @@
     = render "layouts/flash"
     %div{ class: container_class }
       .content
-        .clearfix.max_height
+        .clearfix.max-height
           = yield