diff --git a/public/css/light.css b/public/css/light.css
index 06b132f..c9cd645 100644
--- a/public/css/light.css
+++ b/public/css/light.css
@@ -67,6 +67,36 @@ button.textButton:hover {
 	text-decoration: underline;
 }
 
+a.menuBtn {
+	text-decoration: none;
+}
+button.menuBtn {
+	background: none !important;
+	color: inherit;
+	border: none;
+	padding: 0 !important;
+	font: inherit;
+	cursor: pointer;
+}
+.menuBtnW:hover {
+	background-color: #c9c9c9;
+}
+.menuBtnW {
+	display: inline-block;
+	height: 100%;
+	padding: 10px;
+	position: relative;
+	top: -10px;
+	background-color: #ddd;
+	border-right: 1px solid #bbb;
+}
+.menuBtnW:first-child {
+	border-left: 1px solid #bbb;
+}
+div.toolbar form {
+	display: inline;
+}
+
 form.login>table>tbody>tr>td>label {
 	margin-right: 10px;
 }
diff --git a/public/css/style.css b/public/css/style.css
index 1221fef..ddcf26d 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -38,6 +38,33 @@ button.textButton:hover {
 	text-decoration: underline;
 }
 
+a.menuBtn {
+	text-decoration: none;
+}
+button.menuBtn {
+	background: none !important;
+	color: inherit;
+	border: none;
+	padding: 0 !important;
+	font: inherit;
+	cursor: pointer;
+}
+.menuBtn {
+	text-transform: lowercase;
+}
+.menuBtn:hover {
+	text-decoration: underline;
+}
+.menuBtnW:before {
+	content: "[\00a0";
+}
+.menuBtnW:after {
+	content: "\00a0] ";
+}
+div.toolbar form {
+	display: inline;
+}
+
 form.login>table>tbody>tr>td>label {
 	margin-right: 10px;
 }
diff --git a/views/layouts/main.tt b/views/layouts/main.tt
index aa4906a..fb75ace 100644
--- a/views/layouts/main.tt
+++ b/views/layouts/main.tt
@@ -18,10 +18,10 @@
 						Logged in as <span id="email"><% vars.email | html_entity %></span>
 					</span>
 					<span style="float:right;">
-						<form action="/logout" method="POST">
-							[&nbsp;<a href="/domains" class="bracketButton">domains</a>&nbsp;]
-							[&nbsp;<a href="/account" class="bracketButton">account</a>&nbsp;]
-							[&nbsp;<button class="textButton" action="submit">log&nbsp;out</button>&nbsp;]
+						<span class="menuBtnW"><a href="/domains" class="menuBtn">Domains</a></span><!--
+						--><span class="menuBtnW"><a href="/account" class="menuBtn">Account</a></span><!--
+						--><form action="/logout" method="POST"><!--
+							--><span class="menuBtnW"><button action="submit" class="menuBtn">Log&nbsp;out</button></span>
 						</form>
 					</span>
 				</div>