diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 2fc738c18d..fa25757cfc 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -282,7 +282,7 @@ img.emoji {
 }
 
 .navless-container {
-  margin-top: 20px;
+  margin-top: 68px;
 }
 
 .description-block {
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index db419f7653..33a37ee6d7 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -7,6 +7,9 @@ header {
     margin-bottom: 0;
     min-height: 40px;
     border: none;
+    position: fixed;
+    top: 0;
+    width: 100%;
 
     .navbar-inner {
       filter: none;
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index 697e9d2023..d03f73f287 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -11,6 +11,7 @@
   width: 100%;
   padding: 15px;
   background: #FFF;
+  margin-top: 48px;
 }
 
 .nav-sidebar {
@@ -131,9 +132,9 @@
   .sidebar-wrapper {
     width: 52px;
     position: fixed;
-    left: 50px;
+    top: 0;
+    left: 0;
     height: 100%;
-    margin-left: -50px;
     border-right: 1px solid #EAEAEA;
     overflow-x: hidden;