diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml
index cadecc39c7..435028ecf7 100644
--- a/extra/webapps/pastebin/pastebin-common.xml
+++ b/extra/webapps/pastebin/pastebin-common.xml
@@ -6,25 +6,31 @@
 
 	<t:style t:include="resource:extra/webapps/pastebin/pastebin.css" />
 
-	<div class="navbar">
+    <div id="container">
 
-		<t:a t:href="$pastebin">Pastes</t:a>
-		<t:a t:href="$pastebin/new-paste">New Paste</t:a>
+        <div class="navbar">
 
-		<t:if t:code="furnace.auth:logged-in?">
+            <t:a t:href="$pastebin">Pastes</t:a>
+            <t:a t:href="$pastebin/new-paste">New Paste</t:a>
 
-			<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-				<t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
-			</t:if>
+            <t:if t:code="furnace.auth:logged-in?">
 
-			<t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+                <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
+                    <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                </t:if>
 
-		</t:if>
+                <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+            </t:if>
+            <div style="float: right;">
+                <a href="//factorcode.org"><b>factorcode.org</b></a>
+            </div>
+        </div>
 
-	</div>
+        <div class="page">
+            <h1><t:write-title /></h1>
 
-	<h1><t:write-title /></h1>
-
-        <t:call-next-template />
+            <t:call-next-template />
+        </div>
 
+    </div>
 </t:chloe>
diff --git a/extra/webapps/pastebin/pastebin.css b/extra/webapps/pastebin/pastebin.css
index 16814770a2..2e96ef4f10 100644
--- a/extra/webapps/pastebin/pastebin.css
+++ b/extra/webapps/pastebin/pastebin.css
@@ -1,3 +1,17 @@
+body {
+    margin: 0;
+}
+
+#container {
+    max-width: 1000px;
+}
+
+.page {
+    padding-left: 15px;
+    padding-right: 15px;
+    padding-bottom: 15px;
+}
+
 pre.code {
 	border:1px dashed #ccc;
 	background-color:#f5f5f5;
diff --git a/extra/webapps/pastebin/pastebin.xml b/extra/webapps/pastebin/pastebin.xml
index 3c9cb7ce96..18fdcb3843 100644
--- a/extra/webapps/pastebin/pastebin.xml
+++ b/extra/webapps/pastebin/pastebin.xml
@@ -6,16 +6,16 @@
 
 	<table width="100%">
 		<tr>
-			<th align="left" width="50%">Summary:</th>
-			<th align="left" width="100">Paste by:</th>
-			<th align="left" width="200">Date:</th>
+			<th align="left" width="50%">Summary</th>
+			<th align="left" width="100">Username</th>
+			<th align="left" width="200">Date</th>
 		</tr>
 
 		<t:bind-each t:name="pastes">
 			<tr>
-				<td><t:a t:href="$pastebin/paste" t:query="id"><t:label t:name="summary" /></t:a></td>
+				<td width="100%"><t:a t:href="$pastebin/paste" t:query="id"><t:label t:name="summary" /></t:a></td>
 				<td><t:label t:name="author" /></td>
-				<td><t:label t:name="date" /></td>
+				<td style="white-space: nowrap"><t:label t:name="date" /></td>
 			</tr>
 		</t:bind-each>
 	</table>