diff --git a/.jsbeautifyrc b/.jsbeautifyrc
index 222ca5f6..2bdd9abc 100644
--- a/.jsbeautifyrc
+++ b/.jsbeautifyrc
@@ -3,8 +3,9 @@
 		"indent_size": 4,
 		"indent_level": 0,
 		"indent_with_tabs": true,
-		"allowed_file_extensions": ["css", "scss", "sass", "less"],
-		"max_preserve_newlines": 2
+		"preserve_newlines": true,
+		"max_preserve_newlines": 2,
+		"newline_between_rules": true
 	},
 	"html": {
 		"indent_size": 4,
@@ -45,13 +46,5 @@
 		"indent_size": 4,
 		"indent_level": 0,
 		"indent_with_tabs": true
-	},
-	"_default": {
-		"indent_size": 4,
-		"indent_level": 0,
-		"indent_with_tabs": true,
-		"preserve_newlines": true,
-		"max_preserve_newlines": 2,
-		"wrap_line_length": 0
 	}
 }
\ No newline at end of file
diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss
index 981e9611..074ff0a1 100644
--- a/app/app/styles/view/layout.scss
+++ b/app/app/styles/view/layout.scss
@@ -3,119 +3,103 @@
 }
 
 .zone-navigation {
-    background-color: $color-primary;
-    color: $color-white;
-    padding: 0;
-    margin: 0;
-    width: 100%;
-    font-size: 1rem;
+	background-color: $color-primary;
+	color: $color-white;
+	padding: 0;
+	margin: 0;
+	width: 100%;
+	font-size: 1rem;
 	padding: 15px 40px 15px 40px;
-
-    .content {
-        > .title {
-            padding-left: 15px;
-            font-size: 1rem;
-            display: inline-block;
-            vertical-align: middle;
+	.content {
+		> .title {
+			padding-left: 15px;
+			font-size: 1rem;
+			display: inline-block;
+			vertical-align: middle;
 			color: $color-white;
 			text-decoration: none;
-        }
-
-        > .name {
-            padding-right: 15px;
-            font-size: 1rem;
-            display: inline-block;
-            vertical-align: middle;
-        }
-
+		}
+		> .name {
+			padding-right: 15px;
+			font-size: 1rem;
+			display: inline-block;
+			vertical-align: middle;
+		}
 		> .login {
 			padding: 15px 0 0 0;
-            font-size: 1rem;
-            display: inline-block;
-
+			font-size: 1rem;
+			display: inline-block;
 			> a {
 				color: $color-white;
 				text-decoration: none;
 			}
 		}
-
 		> .search {
 			padding-left: 15px;
-            font-size: 1rem;
-            display: inline-block;
+			font-size: 1rem;
+			display: inline-block;
 			vertical-align: middle;
 			margin-top: 5px;
-
 			> a {
 				color: $color-white;
 				text-decoration: none;
-
 				> .material-icons {
 					font-size: 1.5rem;
 				}
 			}
 		}
-    }
-
-    .header-button {
-        display: inline-block;
-        position: relative;
-        overflow: hidden;
-        width: 35px;
-        height: 35px;
-        line-height: 35px;
-        padding: 0;
-        border-radius: 50%;
-        transition: .3s;
-        cursor: pointer;
-        vertical-align: middle;
-        background-color: $color-white;
-        text-align: center;
-
-        &:hover {
-            @extend .z-depth-1;
-        }
-
-        > .material-icons {
-            color: $color-primary;
-            text-align: center;
-            font-size: 1.4em;
-        }
-
-        > .initials {
-            color: $color-primary;
-            text-align: center;
-            font-size: 1rem;
-            font-style: normal;
-            line-height: 2.6rem;
-            font-family: open_sansregular;
-        }
-
-        &:before {
-            border-radius: 0;
-        }
-    }
+	}
+	.header-button {
+		display: inline-block;
+		position: relative;
+		overflow: hidden;
+		width: 35px;
+		height: 35px;
+		line-height: 35px;
+		padding: 0;
+		border-radius: 50%;
+		transition: .3s;
+		cursor: pointer;
+		vertical-align: middle;
+		background-color: $color-white;
+		text-align: center;
+		&:hover {
+			@extend .z-depth-1;
+		}
+		> .material-icons {
+			color: $color-primary;
+			text-align: center;
+			font-size: 1.4em;
+		}
+		> .initials {
+			color: $color-primary;
+			text-align: center;
+			font-size: 1rem;
+			font-style: normal;
+			line-height: 2.6rem;
+			font-family: open_sansregular;
+		}
+		&:before {
+			border-radius: 0;
+		}
+	}
 }
 
 .zone-header {
 	background-color: $color-header;
 	padding: 0 40px 0 40px;
-
 	> .info {
 		padding: 20px 0 20px 0;
-
 		> .title {
 			color: $color-off-black;
 			font-size: 1.2rem;
 		}
-
 		> .message {
 			color: $color-gray;
 			font-size: 1rem;
 			margin-top: 10px;
 		}
 	}
-
 	> .actions {
 		padding: 20px 0 20px 0;
 	}
@@ -123,7 +107,7 @@
 
 .zone-sidebar {
 	height: 100%;
-	min-height:100%;
+	min-height: 100%;
 	padding: 0 40px 0 40px;
 	border-right: 1px solid $color-border;
 	float: left;
@@ -137,9 +121,8 @@
 .copyright {
 	margin-top: 50px;
 	text-align: center;
-
 	> a {
 		font-size: 0.8rem;
 		color: $color-gray;
 	}
-}
+}
\ No newline at end of file
diff --git a/app/app/templates/components/layout/zone-navigation.hbs b/app/app/templates/components/layout/zone-navigation.hbs
index d1f55b4c..bd36b350 100644
--- a/app/app/templates/components/layout/zone-navigation.hbs
+++ b/app/app/templates/components/layout/zone-navigation.hbs
@@ -1,40 +1,36 @@
 <div id="zone-navigation" class="zone-navigation">
-    <div class="pull-left">
-        <div class="content">
-            {{#if session.authenticated}}
-                <div id="accounts-button" class="header-button">
+    <div class="pull-left content">
+        {{#if session.authenticated}}
+            <div id="accounts-button" class="header-button">
+                <i class="material-icons">apps</i>
+            </div>
+        {{else}}
+            {{#link-to 'application' class='title'}}
+                <div class="header-button" title=session.appMeta.title>
                     <i class="material-icons">apps</i>
                 </div>
-            {{else}}
-                {{#link-to 'application'}}
-                    <div class="header-button" title=session.appMeta.title>
-                        <i class="material-icons">apps</i>
-                    </div>
-                {{/link-to}}
-            {{/if}}
-			{{#link-to 'application'}}
-            	<div>{{session.appMeta.title}}</div>
-			{{/link-to}}
-    	</div>
+            {{/link-to}}
+        {{/if}}
+        {{#link-to 'application' class='title'}}
+            {{session.appMeta.title}}
+        {{/link-to}}
     </div>
 
-    <div class="pull-right hidden-xs hidden-sm">
-        <div class="content">
-            {{#if session.authenticated}}
-                <div class="name">{{session.user.fullname}}</div>
-                <div id="user-button" class="header-button">
-                    <i class="initials">{{session.user.initials}}</i>
-                </div>
-            {{else}}
-                <div class="login">
-                    {{#link-to 'auth.login'}}Login{{/link-to}}
-                </div>
-            {{/if}}
-			<div class="search">
-				{{#link-to 'search'}}
-					<i class="material-icons">search</i>
-				{{/link-to}}
-			</div>
+    <div class="pull-right hidden-xs hidden-sm content">
+        {{#if session.authenticated}}
+            <div class="name">{{session.user.fullname}}</div>
+            <div id="user-button" class="header-button">
+                <i class="initials">{{session.user.initials}}</i>
+            </div>
+        {{else}}
+            <div class="login">
+                {{#link-to 'auth.login'}}Login{{/link-to}}
+            </div>
+        {{/if}}
+        <div class="search">
+            {{#link-to 'search'}}
+                <i class="material-icons">search</i>
+            {{/link-to}}
         </div>
     </div>