diff --git a/gui/app/styles/layout/layout-master.scss b/gui/app/styles/layout/layout-master.scss
index e10e734d..6cf7639e 100644
--- a/gui/app/styles/layout/layout-master.scss
+++ b/gui/app/styles/layout/layout-master.scss
@@ -1,5 +1,10 @@
-.layout-header,
-.layout-footer {
+$break-1: 900px;
+$break-2: 1200px;
+$break-3: 1400px;
+$break-4: 1600px;
+$break-5: 1800px;
+
+.layout-header, .layout-footer {
 	flex: 0 0 auto;
 	width: 100%;
 }
@@ -24,21 +29,20 @@
 footer {
 	margin: auto auto 0 auto;
     bottom: 0;
-	position: -webkit-sticky;
-	position: -moz-sticky;
-	position: -ms-sticky;
-	position: -o-sticky;
-	position: -webkit-sticky;
-	position: sticky;
+	z-index: 888;
+	@include sticky();
 }
 
-@media (min-width: 900px) {
+@media (min-width: $break-1) {
 	.layout-body {
 		flex-direction: row;
 	}
 
 	.layout-sidebar {
 		flex: 0 0 200px;
+		height: calc(100vh - 140px);
+		@include sticky();
+		top: 2rem;
 	}
 
 	.layout-content {
@@ -48,7 +52,7 @@ footer {
 	}
 }
 
-@media (min-width: 1200px) {
+@media (min-width: $break-2) {
 	.layout-body {
 		flex-direction: row;
 	}
@@ -64,7 +68,7 @@ footer {
 	}
 }
 
-@media (min-width: 1400px) {
+@media (min-width: $break-3) {
 	.layout-body {
 		flex-direction: row;
 	}
@@ -80,7 +84,7 @@ footer {
 	}
 }
 
-@media (min-width: 1600px) {
+@media (min-width: $break-4) {
 	.layout-body {
 		flex-direction: row;
 	}
@@ -96,7 +100,7 @@ footer {
 	}
 }
 
-@media (min-width: 1800px) {
+@media (min-width: $break-5) {
 	.layout-body {
 		flex-direction: row;
 	}
diff --git a/gui/app/styles/layout/layout-sidebar.scss b/gui/app/styles/layout/layout-sidebar.scss
index 93bd7588..e477ecd3 100644
--- a/gui/app/styles/layout/layout-sidebar.scss
+++ b/gui/app/styles/layout/layout-sidebar.scss
@@ -2,10 +2,35 @@
 	padding: 1rem;
 }
 
-.sidebar-white {
-	background-color: $color-white;
-}
-
 .sidebar-center {
 	text-align: center;
 }
+
+.sidebar-scroll {
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+.sidebar-white {
+	background-color: $color-white;
+	margin: 10px 10px;
+
+	@media (min-width: $break-1) {
+		margin: 10px 10px;
+		height: calc(100vh - 204px);
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	@media (min-width: $break-2) {
+		margin: 10px 10px;
+	}
+	@media (min-width: $break-3) {
+		margin: 20px 20px;
+	}
+	@media (min-width: $break-4) {
+		margin: 20px 20px;
+	}
+	@media (min-width: $break-5) {
+		margin: 20px 20px;
+	}
+}
diff --git a/gui/app/styles/mixins.scss b/gui/app/styles/mixins.scss
index c0532dd2..9118badb 100644
--- a/gui/app/styles/mixins.scss
+++ b/gui/app/styles/mixins.scss
@@ -1,6 +1,5 @@
 @mixin sticky()
 {
-	position: -webkit-sticky;
 	position: -moz-sticky;
 	position: -ms-sticky;
 	position: -o-sticky;
diff --git a/gui/app/styles/view/document/doc-toc.scss b/gui/app/styles/view/document/doc-toc.scss
index b45dcdde..4024f4a2 100644
--- a/gui/app/styles/view/document/doc-toc.scss
+++ b/gui/app/styles/view/document/doc-toc.scss
@@ -1,15 +1,10 @@
 .document-sidebar {
-	background-color: $color-white;
-	margin: 20px 20px;
-
 	> .document-toc {
 		@include border-radius(3px);
 		@include ease-in();
-		@include sticky();
 		margin: 0;
 		padding: 0 20px 20px 20px;
 		display: block;
-		// height: calc(100vh - 180px);
 
 		> .header {
 			top: 0;
diff --git a/gui/app/templates/components/document/document-toc.hbs b/gui/app/templates/components/document/document-toc.hbs
index 83890406..69fd5e2d 100644
--- a/gui/app/templates/components/document/document-toc.hbs
+++ b/gui/app/templates/components/document/document-toc.hbs
@@ -1,5 +1,5 @@
 {{#unless emptyState}}
-	<div id="sidebar" class="document-sidebar">
+	<div id="sidebar" class="sidebar-white document-sidebar">
 		<div id="doc-toc" class="document-toc {{if isDesktop 'document-toc-desktop'}}">
 			<div class="header">
 				{{#if canEdit}}
diff --git a/gui/app/templates/components/document/view-attachment.hbs b/gui/app/templates/components/document/view-attachment.hbs
index 42063094..11a159ef 100644
--- a/gui/app/templates/components/document/view-attachment.hbs
+++ b/gui/app/templates/components/document/view-attachment.hbs
@@ -17,8 +17,6 @@
 				</li>
 			{{/each}}
 		</ul>
-	{{else}}
-		<p>No attachments found</p>
 	{{/if}}
 	{{#if canEdit}}
 		<div class="upload-document-files">