diff --git a/app/app/pods/customize/folders/template.hbs b/app/app/pods/customize/folders/template.hbs
index f19f6e52..09bbcf09 100644
--- a/app/app/pods/customize/folders/template.hbs
+++ b/app/app/pods/customize/folders/template.hbs
@@ -1,43 +1,45 @@
-<div class="input-form">
-    <form>
-        <div class="heading">
-            <div class="title">{{folders.length}} shared {{label}}</div>
-            <div class="tip">View and change shared space ownership</div>
-        </div>
-        <div class="input-control">
-            <table class="basic-table">
-                <thead>
-                    <tr>
-                        <th class="bordered">Space</th>
-                        <th class="bordered">Participants</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{#each folders as |folder|}}
-                        <tr>
-                            <td class="bordered">
-                                {{#link-to 'folders.folder' folder.id folder.slug}}{{folder.name}}{{/link-to}}
-                            </td>
-                            <td class="bordered">
-                                {{#each folder.sharedWith as |person|}}
-                                    {{#if person.isEveryone}}
-                                        Everyone
-                                    {{else}}
+<div class="global-folder-settings">
+	<div class="input-form form-borderless">
+	    <form>
+	        <div class="heading">
+	            <div class="title">{{folders.length}} shared {{label}}</div>
+	            <div class="tip">View and change shared space ownership</div>
+	        </div>
+	        <div class="input-control">
+	            <table class="basic-table">
+	                <thead>
+	                    <tr>
+	                        <th class="bordered">Space</th>
+	                        <th class="bordered">Participants</th>
+	                    </tr>
+	                </thead>
+	                <tbody>
+	                    {{#each folders as |folder|}}
+	                        <tr>
+	                            <td class="bordered">
+	                                {{#link-to 'folders.folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}}
+	                            </td>
+	                            <td class="bordered">
+	                                {{#each folder.sharedWith as |person|}}
+	                                    {{#if person.isEveryone}}
+	                                        Everyone
+	                                    {{else}}
 
-                                        {{#if person.isOwner}}
-                                            <span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span>
-                                        {{else}}
-                                            {{person.firstname}} {{person.lastname}}
-                                            <a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a>
-                                        {{/if}}
-                                    {{/if}}
-                                    <br/>
-                                {{/each}}
-                            </td>
-                        </tr>
-                    {{/each}}
-                </tbody>
-            </table>
-        </div>
-    </form>
-</div>
\ No newline at end of file
+	                                        {{#if person.isOwner}}
+	                                            <span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span>
+	                                        {{else}}
+	                                            {{person.firstname}} {{person.lastname}}
+	                                            <a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a>
+	                                        {{/if}}
+	                                    {{/if}}
+	                                    <br/>
+	                                {{/each}}
+	                            </td>
+	                        </tr>
+	                    {{/each}}
+	                </tbody>
+	            </table>
+	        </div>
+	    </form>
+	</div>
+</div>
diff --git a/app/app/pods/customize/general/template.hbs b/app/app/pods/customize/general/template.hbs
index c7b26e69..c161a5c8 100644
--- a/app/app/pods/customize/general/template.hbs
+++ b/app/app/pods/customize/general/template.hbs
@@ -1,4 +1,4 @@
-<div class="input-form">
+<div class="input-form form-borderless">
     <form>
         <div class="heading">
             <div class="title">General Settings</div>
@@ -26,4 +26,4 @@
             <div class="regular-button button-blue" {{ action 'save' }}>save</div>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs
index 22a00a02..97e2e6e1 100644
--- a/app/app/pods/customize/template.hbs
+++ b/app/app/pods/customize/template.hbs
@@ -1,18 +1,30 @@
-{{#header/page-navigation settingsMode=true}}
-	{{header/message-box message="Manage this Documize instance"}}
-{{/header/page-navigation}}
+{{#layout/zone-container}}
 
-{{#layout/page-container}}
-		{{#layout/page-sidebar}}
-			<div class="sidebar-menu">
-				<ul class="options">
-					{{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}}
-					{{#link-to 'customize.folders' activeClass='selected' class="option" tagName="li"}}Spaces{{/link-to}}
-			        {{#link-to 'customize.users' activeClass='selected' class="option" tagName="li"}}Users{{/link-to}}
-				</ul>
-			</div>
-		{{/layout/page-sidebar}}
-		{{#layout/page-content}}
-			{{outlet}}
-		{{/layout/page-content}}
-{{/layout/page-container}}
+	{{layout/zone-navigation}}
+
+	{{#layout/zone-header title="Documize Settings" message="General options, space management, user management"}}
+		<div class="pull-right">
+			{{#link-to 'folders.folder' folder.id folder.slug}}
+				<div class="regular-button button-white">
+					<i class="material-icons">arrow_back</i>
+					<div class="name">space</div>
+				</div>
+			{{/link-to}}
+		</div>
+	{{/layout/zone-header}}
+
+	{{#layout/zone-sidebar}}
+		<div class="sidebar-menu">
+			<ul class="options">
+				{{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}}
+				{{#link-to 'customize.folders' activeClass='selected' class="option" tagName="li"}}Spaces{{/link-to}}
+				{{#link-to 'customize.users' activeClass='selected' class="option" tagName="li"}}Users{{/link-to}}
+			</ul>
+		</div>
+	{{/layout/zone-sidebar}}
+
+	{{#layout/zone-content}}
+		{{outlet}}
+	{{/layout/zone-content}}
+
+{{/layout/zone-container}}
diff --git a/app/app/pods/customize/users/template.hbs b/app/app/pods/customize/users/template.hbs
index 2e196261..e858f5a8 100644
--- a/app/app/pods/customize/users/template.hbs
+++ b/app/app/pods/customize/users/template.hbs
@@ -1,4 +1,4 @@
-<div class="input-form">
+<div class="input-form form-borderless">
     <form>
         <div class="heading">
             <div class="title">Add User</div>
@@ -20,4 +20,4 @@
     </form>
 </div>
 
-<div class="clearfix" /> {{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}}
\ No newline at end of file
+<div class="clearfix" /> {{settings/user-list users=model onDelete=(action "onDelete") onSave=(action "onSave") onPassword=(action "onPassword")}}
diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss
index b1946208..2caa40fa 100644
--- a/app/app/styles/base.scss
+++ b/app/app/styles/base.scss
@@ -52,6 +52,17 @@ a {
 	}
 }
 
+a.alt {
+	color: $color-blue;
+	text-decoration: none;
+	cursor: pointer;
+
+	a:hover, a:focus {
+		text-decoration: underline;
+	}
+}
+
+
 $i: 150;
 @while $i > 0 {
 	.margin-#{$i} { margin: #{$i}px; }
diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss
index f4a5b0fd..4c4cba74 100644
--- a/app/app/styles/color.scss
+++ b/app/app/styles/color.scss
@@ -28,6 +28,7 @@ $color-stroke: #e1e1e1;
 
 $color-tooltip: #a1a1a1;
 $color-toast: #4c4c4c;
+$color-checkbox: #115a97;
 
 $color-chip: #98A2AB;
 $color-chip: #dff0f9;
diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss
index fdd91163..1c15e8f7 100644
--- a/app/app/styles/view/layout.scss
+++ b/app/app/styles/view/layout.scss
@@ -1,17 +1,7 @@
-.page-container {
+.zone-container {
 	min-height: 500px; //ensure dropdowns render in viewport
 }
 
-.copyright {
-	margin-top: 50px;
-	text-align: center;
-
-	> a {
-		font-size: 0.8rem;
-		color: $color-gray;
-	}
-}
-
 .zone-navigation {
     background-color: $color-primary;
     color: $color-white;
@@ -144,3 +134,13 @@
 	padding: 30px 40px 30px 40px;
 	float: left;
 }
+
+.copyright {
+	margin-top: 50px;
+	text-align: center;
+
+	> a {
+		font-size: 0.8rem;
+		color: $color-gray;
+	}
+}
diff --git a/app/app/styles/view/page-documents.scss b/app/app/styles/view/page-documents.scss
index 1c6f4248..6a541785 100644
--- a/app/app/styles/view/page-documents.scss
+++ b/app/app/styles/view/page-documents.scss
@@ -85,7 +85,7 @@
 				width: 10px;
 			    margin: 0;
 			    padding: 0;
-				color: $color-blue;
+				color: $color-checkbox;
 			}
 		}
 
diff --git a/app/app/styles/view/page-settings.scss b/app/app/styles/view/page-settings.scss
index 99959170..d40f5863 100644
--- a/app/app/styles/view/page-settings.scss
+++ b/app/app/styles/view/page-settings.scss
@@ -1,3 +1,7 @@
+.global-folder-settings {
+
+}
+
 .user-list {
 	margin: 30px 0;
 
@@ -21,7 +25,7 @@
 	}
 
 	.checkbox {
-		color: $color-link;
+		color: $color-checkbox;
 		cursor: pointer;
 	}
 }
diff --git a/app/app/templates/components/layout/zone-container.hbs b/app/app/templates/components/layout/zone-container.hbs
index 252fff94..0e828778 100644
--- a/app/app/templates/components/layout/zone-container.hbs
+++ b/app/app/templates/components/layout/zone-container.hbs
@@ -1,4 +1,4 @@
-<div class="page-container">
+<div class="zone-container">
     <div class="container-fluid">
 		<div class="row">
 			{{yield}}
diff --git a/app/app/templates/components/settings/user-list.hbs b/app/app/templates/components/settings/user-list.hbs
index fea8b2eb..7c87a021 100644
--- a/app/app/templates/components/settings/user-list.hbs
+++ b/app/app/templates/components/settings/user-list.hbs
@@ -1,6 +1,6 @@
 <div class="user-list">
     <div class="heading">{{users.length}} users</div>
-    <table class="basic-table no-table-border">
+    <table class="basic-table">
         <thead>
             <tr>
                 <th class="border-bottom border-top">Firstname</th>
@@ -130,4 +130,4 @@
         </div>
     </div>
     <div class="clearfix"></div>
-</div>
\ No newline at end of file
+</div>