diff --git a/themes/Sixteen/forum.php b/themes/Sixteen/forum.php
index b130b0c87..0eabc4907 100644
--- a/themes/Sixteen/forum.php
+++ b/themes/Sixteen/forum.php
@@ -6,19 +6,24 @@
 
 ?>
 </div>
-<div class="jumbotron">
-	<div class="container">
-		<h2 class="forum-title"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2><span class="pull-right"><?php echo $post_link ?><?php echo $paging_links ?></span>
-		<div class="forum-desc"><?php echo $cur_forum['forum_desc'] ?></div>
-	</div>
-</div>
 <div class="container">
+	<h2 class="forum-title"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></h2>
+	<div class="forum-navigation btn-toolbar">
+		<span class="btn-group">
+			<a href="index.php" class="btn btn-primary"><span class="fa fa-fw fa-home"></span></a>
+			<a href="viewforum.php?id=<?php echo $id ?>" class="btn btn-primary"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></a>
+		</span>
+		<?php if ($id != '0' && $is_admmod) { ?>
+			<span class="btn-group">
+				<a class="btn btn-default" href="backstage/moderate.php?fid=<?php echo $forum_id ?>&p=<?php echo $p ?>"><span class="fa fa-fw fa-eye"></span> <?php _e('Moderate', 'luna') ?></a>
+			</span>
+		<?php } ?>
+		<span class="btn-group pull-right">
+			<?php echo $post_link ?><?php echo $paging_links ?>
+		</span>
+	</div>
 	<div class="row forumview">
 		<div class="col-sm-3">
-			<div class="list-group list-group-forum">
-				<a class="list-group-item" href="index.php"><span class="fa fa-fw fa-chevron-left"></span> <?php _e('Back to index', 'luna') ?></a>
-			</div>
-			<hr />
 			<?php if ((is_subforum($id) && $id != '0')): ?>
 				<h5 class="list-group-head"><?php _e('Subforums', 'luna') ?></h5>
 				<div class="list-group list-group-forum">
@@ -26,16 +31,27 @@
 				</div>
 				<hr />
 			<?php endif; ?>
-			<div class="list-group list-group-forum">
-				<?php draw_mark_read('list-group-item', 'forumview') ?>
-				<?php if ($id != '0' && $is_admmod) { ?>
-					<a class="list-group-item" href="backstage/moderate.php?fid=<?php echo $forum_id ?>&p=<?php echo $p ?>"><span class="fa fa-fw fa-eye"></span> <?php _e('Moderate forum', 'luna') ?></a>
-				<?php } ?>
-			</div>
 		</div>
 		<div class="col-sm-9">
-			<div class="list-group list-group-topic">
+			<div class="forum-box">
+				<div class="row forum-header">
+					<div class="col-xs-12"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></div>
+				</div>
 				<?php draw_topics_list(); ?>
 			</div>
 		</div>
+	</div>
+	<div class="forum-navigation btn-toolbar">
+		<span class="btn-group">
+			<a href="index.php" class="btn btn-primary"><span class="fa fa-fw fa-home"></span></a>
+			<a href="viewforum.php?id=<?php echo $id ?>" class="btn btn-primary"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></a>
+		</span>
+		<?php if ($id != '0' && $is_admmod) { ?>
+			<span class="btn-group">
+				<a class="btn btn-default" href="backstage/moderate.php?fid=<?php echo $forum_id ?>&p=<?php echo $p ?>"><span class="fa fa-fw fa-eye"></span> <?php _e('Moderate', 'luna') ?></a>
+			</span>
+		<?php } ?>
+		<span class="btn-group pull-right">
+			<?php echo $post_link ?><?php echo $paging_links ?>
+		</span>
 	</div>
\ No newline at end of file
diff --git a/themes/Sixteen/objects/topic.php b/themes/Sixteen/objects/topic.php
index 4b8ee9695..daf1e323d 100644
--- a/themes/Sixteen/objects/topic.php
+++ b/themes/Sixteen/objects/topic.php
@@ -1,14 +1,10 @@
-<div class="list-group-item <?php echo $item_status ?><?php if ($cur_topic['soft'] == true) echo ' soft'; ?>">
-	<span class="middot">&middot;</span>
-	<span class="hidden-xs hidden-sm hidden-md hidden-lg">
-		<?php echo forum_number_format($topic_count + $start_from) ?>
-	</span>
-	<?php echo $subject_status ?> <a href="<?php echo $url ?>"><?php echo $subject ?></a> <?php echo $subject_new_posts ?> <?php echo $by ?> <?php echo $subject_multipage ?>
-	<?php if ($cur_topic['moved_to'] == 0) { ?>
-		<span class="text-muted"> &middot; 
-			<?php echo $last_post_date ?>
-			&middot; <?php echo $forum_name ?>
-			<?php if ($cur_topic['moved_to'] == 0) { ?><span class="label label-default"><?php echo forum_number_format($cur_topic['num_replies']) ?></span><?php } ?>
-		</span>
-	<?php } ?>
+<div class="row topic-row <?php echo $item_status ?><?php if ($cur_topic['soft'] == true) echo ' soft'; ?>">
+	<div class="col-sm-6 col-xs-6">
+		<div class="<?php echo $icon_type ?>"><?php echo forum_number_format($topic_count + $start_from) ?></div>
+		<div class="tclcon">
+			<span class="middot">&middot; </span><a href="<?php echo $url ?>"><?php echo $subject."\n" ?></a><?php echo $by ?>
+		</div>
+	</div>
+	<div class="col-sm-2 hidden-xs"><?php if (is_null($cur_topic['moved_to'])) { ?><b><?php echo forum_number_format($cur_topic['num_replies']) ?></b> <?php echo $replies_label ?><br /><b><?php echo forum_number_format($cur_topic['num_views']) ?></b> <?php echo $views_label ?><?php } ?></div>
+	<div class="col-sm-4 col-xs-6"><?php echo $last_post_date ?></div>
 </div>
\ No newline at end of file