diff --git a/src/styles/_error.sass b/src/styles/_error.sass
index 02c20aa7..5ad02dc4 100644
--- a/src/styles/_error.sass
+++ b/src/styles/_error.sass
@@ -60,14 +60,13 @@
 
 #node-overlay
 	#error-container
-		position: fixed
-		top: $navbar-height
 		align-items: flex-start
+		position: fixed
+		top: $nav-link-height
 
 		#error-box
-			box-shadow: 0 0 25px rgba(black, .1), 0 0 50px rgba(black, .1)
-			width: auto
 			border-top-left-radius: 0
 			border-top-right-radius: 0
+			box-shadow: 0 0 25px rgba(black, .1), 0 0 50px rgba(black, .1)
 			position: relative
 			width: 100%
diff --git a/src/styles/_pages.sass b/src/styles/_pages.sass
index ee0e37a0..b08417b8 100644
--- a/src/styles/_pages.sass
+++ b/src/styles/_pages.sass
@@ -409,7 +409,6 @@ a.page-card-cta
 		display: block
 		+position-center-translate
 
-
 		+media-xs
 			display: none
 		+media-sm
@@ -419,9 +418,6 @@ a.page-card-cta
 		+media-lg
 			width: 100%
 
-.services.navbar-backdrop-overlay
-	background: rgba(black, .5)
-
 .services
 	.page-card-side
 		max-width: 500px
diff --git a/src/styles/components/_base.sass b/src/styles/components/_base.sass
index 027f1b92..51aa3ef4 100644
--- a/src/styles/components/_base.sass
+++ b/src/styles/components/_base.sass
@@ -28,5 +28,6 @@ body
 .page-content
 	position: relative
 	flex: 1
-	.container-box
-		+container-box
+
+.container-box
+	+container-box
diff --git a/src/styles/components/_card.sass b/src/styles/components/_card.sass
index edb993fc..d13003b7 100644
--- a/src/styles/components/_card.sass
+++ b/src/styles/components/_card.sass
@@ -11,7 +11,7 @@
 		border: none
 
 	.card-body
-		padding: 20px 0
+		padding: 15px 0
 
 .card-fade
 	img
diff --git a/src/styles/theatre.sass b/src/styles/theatre.sass
index 10b95e22..abb97a3a 100644
--- a/src/styles/theatre.sass
+++ b/src/styles/theatre.sass
@@ -26,6 +26,7 @@ body.theatre .container-page
 		display: flex
 		align-items: center
 		justify-content: center
+
 		.page-body
 			height: 100%
 			width: 100%
diff --git a/src/templates/menus/user_base.pug b/src/templates/menus/user_base.pug
index 079fc589..a3fa6520 100644
--- a/src/templates/menus/user_base.pug
+++ b/src/templates/menus/user_base.pug
@@ -1,7 +1,7 @@
 | {% block menu_body %}
 | {% if current_user.is_authenticated %}
 
-li(class="dropdown")
+li.dropdown
 	| {% block menu_avatar %}
 	a.navbar-item.dropdown-toggle(href="#", data-toggle="dropdown", title="{{ current_user.email }}")
 		img.gravatar(
@@ -9,42 +9,38 @@ li(class="dropdown")
 		alt="Avatar")
 	| {% endblock menu_avatar %}
 
-	ul.dropdown-menu
+	ul.dropdown-menu.dropdown-menu-right
 		| {% if not current_user.has_role('protected') %}
 		| {% block menu_list %}
 		li
 			a.navbar-item(
 			href="{{ url_for('projects.home_project') }}"
 			title="Home")
-				i.pi-home
-				| Home
+				#[i.pi-home] Home
 
 		li
 			a.navbar-item(
 			href="{{ url_for('projects.index') }}"
 			title="My Projects")
-				i.pi-star
-				| My Projects
+				#[i.pi-star] My Projects
 
 		| {% if current_user.has_organizations() %}
 		li
 			a.navbar-item(
 			href="{{ url_for('pillar.web.organizations.index') }}"
 			title="My Organizations")
-				i.pi-users
-				| My Organizations
+				#[i.pi-users] My Organizations
 		| {% endif %}
 
 		li
 			a.navbar-item(
 			href="{{ url_for('settings.profile') }}"
 			title="Settings")
-				i.pi-cog
-				| Settings
+				#[i.pi-cog] Settings
 
 		| {% endblock menu_list %}
 
-		li.divider(role="separator")
+		li.dropdown-divider(role="separator")
 		| {% endif %}
 
 		li