diff --git a/server/gwt-editor/src/main/webapp/webtrans/Application.xhtml b/server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
index 0576b9699c..649dbe230a 100644
--- a/server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
+++ b/server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
@@ -71,7 +71,7 @@
     <div class='Ai(st) D(f) Fld(c) Flxs(0) H(100%)'>
       <div class='Ai(st) D(f) Fld(c) Fld(r)--sm Flxs(0) H(100vh) H(100%)'>
         <div id="root" class="Or(1) Or(0)--sm" />
-        <div id="container" class="Ovx(s) Ovx(h)--lg"/>
+        <div id="container" class="container-editor Ovx(s) Ovx(h)--lg"/>
       </div>
     </div>
     <script type="text/javascript"
diff --git a/server/zanata-frontend/src/frontend/app/containers/App.js b/server/zanata-frontend/src/frontend/app/containers/App.js
index b8ff1e732c..a4eca096ca 100644
--- a/server/zanata-frontend/src/frontend/app/containers/App.js
+++ b/server/zanata-frontend/src/frontend/app/containers/App.js
@@ -34,7 +34,7 @@ class App extends Component {
           titleTemplate='Zanata: %s'
         />
         <Nav active={activePath} links={links} loading={loading} />
-        {children}
+        <div className='container-sidebar'>{children}</div>
       </div>
     )
   }
diff --git a/server/zanata-frontend/src/frontend/app/styles/style.less b/server/zanata-frontend/src/frontend/app/styles/style.less
index 2b11220bab..5a0723e17c 100644
--- a/server/zanata-frontend/src/frontend/app/styles/style.less
+++ b/server/zanata-frontend/src/frontend/app/styles/style.less
@@ -1310,6 +1310,16 @@ dd {
   padding-left: @padding-large-horizontal;
 }
 
+.container-sidebar {
+  margin-left:4.5em;
+  margin-right:1.5em;
+}
+
+.container-editor {
+  margin-left:6em;
+  width:100%;
+}
+
 .container-fluid {
   margin-right: auto;
   margin-left: auto;
@@ -4647,6 +4657,16 @@ button.btn-link {
     flex-shrink: 0;
   }
 
+  main {
+    margin-left:0;
+  }
+
+  .container-sidebar, .container-editor {
+    margin-left:0;
+    margin-right:0;
+    width:100%;
+  }
+
   .page {
     flex: 1;
   }
@@ -4654,6 +4674,7 @@ button.btn-link {
   #nav {
     height: initial;
     width: 100%;
+    position:relative;
   }
 
   .nav-bar {
@@ -4677,6 +4698,20 @@ button.btn-link {
     min-height: 100%;
   }
 
+  main {
+    margin-left:4.5em;
+  }
+
+  .container-sidebar {
+    margin-left:4.5em;
+    width:90%;
+  }
+
+  .container-editor {
+    margin-left:6em;
+    width:100%;
+  }
+
   #nav {
     min-height: 100%;
   }