diff --git a/public/css/noscript.less b/public/css/noscript.less
index 9df1243c50..6adb091685 100644
--- a/public/css/noscript.less
+++ b/public/css/noscript.less
@@ -14,6 +14,10 @@ noscript {
 
 			.icon {
 				float: left;
+				width: auto;
+				height: auto;
+				padding: 0;
+				margin: 0;
 				margin-right: 1em;
 			}
 
@@ -34,7 +38,8 @@ noscript {
 
 			img {
 				float: left;
-				width: 32px;
+				width: 64px;
+				margin-right: 1em;
 			}
 
 			p {
@@ -52,6 +57,20 @@ noscript {
 	.posts {
 		li {
 			.default;
+
+			img {
+				width: 64px;
+			}
+
+			.profile {
+				text-align: center;
+
+				span {
+					font-weight: bold;
+					display: inline-block;
+					margin-top: 1em;
+				}
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/public/templates/noscript/category.tpl b/public/templates/noscript/category.tpl
index 8a25bfc69d..75dbafe770 100644
--- a/public/templates/noscript/category.tpl
+++ b/public/templates/noscript/category.tpl
@@ -8,10 +8,11 @@
 			<li>
 				<a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a>
 				<div class="teaser">
-					<img class="img-thumbnail" src="../../graph/users/{topics.teaser_username}/picture" />
+					<img class="img-thumbnail" src="{topics.teaser_userpicture}" />
 					<p>
 						{topics.teaser_text} &mdash; {topics.teaser_timestamp} ago
 					</p>
+					<div class="clear"></div>
 				</div>
 			</li>
 			<!-- END topics -->
diff --git a/public/templates/noscript/header.tpl b/public/templates/noscript/header.tpl
index 83be5b0fbc..57762cc146 100644
--- a/public/templates/noscript/header.tpl
+++ b/public/templates/noscript/header.tpl
@@ -1,6 +1,6 @@
-		<div class="alert alert-error">
+		<div class="alert alert-danger">
 			<p>
-				Your browser does not seem to support javascript. As a result, your viewing experience will be diminished.
+				Your browser does not seem to support javascript. As a result, your viewing experience will be diminished, and you have been placed in <strong>read-only mode</strong>.
 			</p>
 			<p>
 				Please download a browser that supports javascript, or enable it, if it disabled (i.e. NoScript).
diff --git a/public/templates/noscript/topic.tpl b/public/templates/noscript/topic.tpl
index 5a4e5925a8..fbc4ce85a7 100644
--- a/public/templates/noscript/topic.tpl
+++ b/public/templates/noscript/topic.tpl
@@ -2,11 +2,11 @@
 			<!-- BEGIN main_posts -->
 			<li>
 				<div class="row">
-					<div class="span2">
-						<img src="{main_posts.picture}" /><br />
-						{main_posts.username}
+					<div class="col-lg-2 profile">
+						<img class="img-thumbnail" src="{main_posts.picture}" /><br />
+						<span class="username">{main_posts.username}</span>
 					</div>
-					<div class="span10">
+					<div class="col-lg-10">
 						{main_posts.content}
 					</div>
 				</div>
@@ -15,11 +15,11 @@
 			<!-- BEGIN posts -->
 			<li>
 				<div class="row">
-					<div class="span2">
-						<img src="{posts.picture}" /><br />
-						{posts.username}
+					<div class="col-lg-2 profile">
+						<img class="img-thumbnail" src="{posts.picture}" /><br />
+						<span class="username">{posts.username}</span>
 					</div>
-					<div class="span10">
+					<div class="col-lg-10">
 						{posts.content}
 					</div>
 					<div class="clear"></div>
diff --git a/src/webserver.js b/src/webserver.js
index d802929f53..0ea5f47dfe 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -235,8 +235,7 @@ var express = require('express'),
 					});
 				},
 				function(topicData, next) {
-					var posts = topicData.posts.push(topicData.main_posts[0]),
-						lastMod = 0,
+					var lastMod = 0,
 						timestamp;
 
 					for(var x=0,numPosts=topicData.posts.length;x<numPosts;x++) {