diff --git a/sass/credentials.scss b/sass/credentials.scss
index 8b07a1ec..5e34879d 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -20,12 +20,24 @@
  *
  */
 
+//override nc style to fix wrong offset
+#content {
+  padding-top: 47px !important; // 45px but +2 because of borders
+}
+
+#app-content{
+  //width: calc(100% - 300px);
+  margin-left: 300px;
+  width: calc(100vw - 300px);
+}
+
 #app-content {
   overflow-x: hidden;
-  width: 100%;
+  //width: 100%;
   #app-content-wrapper {
     min-height: 95%;
-    width: 100%;
+    display: block;
+    //width: 100%;
     #passman-controls {
       text-align: center;
       &.sidebar-shown {
@@ -144,10 +156,9 @@
         @include border-bottom-radius(3px);
       }
     }
+
     .credential-table {
-      /*width: 100%;
-      margin-top: 44px;
-      */
+      width: calc(100vw - 300px);
       tr:hover {
         background-color: darken(#fff, 4%);
       }
diff --git a/templates/main.php b/templates/main.php
index a85ccd66..33014a47 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -177,9 +177,9 @@ style('passman', 'app');
 		</div>
 	</div>
 
-	<div id="app-content">
-		<div id="app-content-wrapper">
-			<div id="content" ng-view="">
+	<div id="app-content" class="testwithborder1">
+		<div id="app-content-wrapper" class="testwithborder2">
+			<div id="content" ng-view="" class="testwithborder3">
 
 			</div>
 		</div>
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html
index 30fbc62f..22ac9854 100644
--- a/templates/views/show_vault.html
+++ b/templates/views/show_vault.html
@@ -45,7 +45,7 @@
 	<div class="loaderContainer" ng-if="show_spinner">
 		<div class="loader" use-theme type="'border-bottom-color'"></div>
 	</div>
-	<div ng-init="menuOpen = false;">
+	<div class="testwithborder" ng-init="menuOpen = false;">
 		<table class="credential-table"
 			   ng-if="view_mode === 'list'">
 			<tr ng-repeat="credential in filtered_credentials | orderBy:'label'"