diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index 56ea94b6e4..e3a8688472 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -150,21 +150,21 @@ define(['composer'], function(composer) {
 		}
 
 		var recentReplies = $('#category_recent_replies');
-		var reply;
+		var replies = '';
 		for (var i = 0, numPosts = posts.length; i < numPosts; ++i) {
 
-			reply = $('<li data-pid="'+ posts[i].pid +'">' +
+			replies += '<li data-pid="'+ posts[i].pid +'">' +
 						'<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" class="img-rounded user-img" src="' + posts[i].picture + '"/></a>' +
 						'<a href="' + RELATIVE_PATH + '/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' +
 							'<strong><span>'+ posts[i].username + '</span></strong>' +
 							'<p>' +	posts[i].content + '</p>' +
 						'</a>' +
 						'<span class="timeago pull-right" title="' + posts[i].relativeTime + '"></span>' +
-					   '</li>');
-
-			recentReplies.append(reply);
+					   '</li>';
 		}
 
+		recentReplies.html(replies);
+
 		$('#category_recent_replies span.timeago').timeago();
 		app.createUserTooltips();
 	};
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 98f9fbf0a5..419fb091d7 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -192,7 +192,7 @@ define(['taskbar'], function(taskbar) {
 			});
 
 
-			postContainer.on('click', '.formatting-bar button', function() {
+			postContainer.on('click', '.action-bar button', function() {
 				var	action = $(this).attr('data-action');
 
 				switch(action) {
diff --git a/public/templates/composer.tpl b/public/templates/composer.tpl
index 123f0d85b7..f4649050bd 100644
--- a/public/templates/composer.tpl
+++ b/public/templates/composer.tpl
@@ -17,15 +17,15 @@
 						<input type="file" id="files" name="files[]" multiple class="hide"/>
 				</form>
 			</div>
-			<div class="btn-group pull-right">
-				<button class="btn btn-default" data-action="discard" tabIndex="5"><i class="fa fa-times"></i> Discard</button>
-				<button data-action="post" class="btn btn-default" tabIndex="3"><i class="fa fa-check"></i> Submit</button>
-			</div>
 		</div>
 
 		<ul class="nav nav-tabs">
 			<li class="active"><a data-pane=".tab-write" data-toggle="tab">Write</a></li>
 			<li><a data-pane=".tab-preview" data-toggle="tab">Preview</a></li>
+			<li class="btn-group pull-right action-bar">
+				<button class="btn btn-default" data-action="discard" tabIndex="5"><i class="fa fa-times"></i> Discard</button>
+				<button data-action="post" class="btn btn-default" tabIndex="3"><i class="fa fa-check"></i> Submit</button>
+			</li>
 		</ul>
 
 		<div class="tab-content">