diff --git a/amanuensis/resources/page.css b/amanuensis/resources/page.css
index 29c80fb..7d0b6ec 100644
--- a/amanuensis/resources/page.css
+++ b/amanuensis/resources/page.css
@@ -17,14 +17,16 @@ div#header {
 	box-shadow: 2px 2px 10px #888888;
 	border-radius: 5px;
 	overflow: auto;
+	position: relative;
 }
 div#header p, div#header h2 {
 	margin: 5px;
-	float: left;
 }
 div#login-status {
-	float: right;
 	text-align: right;
+	position: absolute;
+	top: 10px;
+	right: 10px;
 }
 div#sidebar {
 	width: 200px;
@@ -143,10 +145,13 @@ div.dashboard-lexicon-item p {
 		max-width: 548px;
 		width: inherit;
 		float: inherit;
-		margin: 5px auto;
+		margin: 10px auto;
 	}
 	div#content{
-		margin: 5px auto;
+		margin: 10px auto;
+	}
+	div.content-1col {
+		max-width: 564px;
 	}
 	div.content-2col {
 		max-width: 564px;
diff --git a/amanuensis/templates/page.html b/amanuensis/templates/page.html
index e577a9a..dd96b7f 100644
--- a/amanuensis/templates/page.html
+++ b/amanuensis/templates/page.html
@@ -11,8 +11,8 @@
 		<div id="header">
 			<div id="login-status" {% block login_status_attr %}{% endblock %}>
 				{% if current_user.is_authenticated %}
-				Logged in as <b>{{ current_user.username -}}</b>
-				<br><a href="{{ url_for('auth.logout') }}">Logout</a>
+				<b>{{ current_user.username -}}</b>
+				(<a href="{{ url_for('auth.logout') }}">Logout</a>)
 				{% else %}
 				<a href="{{ url_for('auth.login') }}">Login</a>
 				{% endif %}