diff --git a/changelog/56_UNRELEASED_2020-xx-xx.md b/changelog/56_UNRELEASED_2020-xx-xx.md
index e3e1d20a..45fcac28 100644
--- a/changelog/56_UNRELEASED_2020-xx-xx.md
+++ b/changelog/56_UNRELEASED_2020-xx-xx.md
@@ -16,6 +16,6 @@
 - Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product
 
 ### General & other improvements/fixes
-- Optimized the top navbar height to waste less space
+- Optimized the top navbar height and overall spacing to waste less space
 - Replaced the scan-mode-switch-button by a native button because it's less disturbing
 - Fixed that the "contextual time ago" of date/time pickers was not displayed
diff --git a/public/css/grocy.css b/public/css/grocy.css
index a869506e..00e0b5a8 100644
--- a/public/css/grocy.css
+++ b/public/css/grocy.css
@@ -322,8 +322,16 @@ input::-webkit-inner-spin-button {
 	}
 
 	#mainNav.fixed-top .sidenav-toggler {
-		margin-top:calc(100vh - 48px)
+		margin-top:calc(100vh - 48px);
 	}
+
+	.content-wrapper {
+		margin-left: 245px;
+	}
+}
+
+body.fixed-nav {
+	padding-top: 54px;
 }
 
 html {
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index a72287da..985902f8 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -420,7 +420,7 @@
 	@endif
 
 	<div class="content-wrapper pt-0">
-		<div class="container-fluid">
+		<div class="container-fluid pr-1 pl-md-3 pl-1">
 			<div class="row mb-3">
 				<div id="page-content" class="col content-text">
 					@yield('content')