diff --git a/public/css/style.less b/public/css/style.less
index 8c636f8757..69eab2e17c 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -16,7 +16,7 @@ body {
 		margin-bottom: 350px;
 	}
 
-	@media (min-width: 979px) 
+	@media (min-width: 979px)
 	{
 		padding-top: 70px;
 	}
@@ -94,7 +94,7 @@ footer.footer {
 		color: #bebebe;
 		outline: 0;
 
-		&:focus { 
+		&:focus {
 			outline: 0;
 			border:none !important;
 			box-shadow:none !important;
@@ -221,7 +221,7 @@ footer.footer {
       color:green;
     }
 }
- 
+
 .user-profile-picture {
    width:128px;
 }
@@ -270,8 +270,8 @@ footer.footer {
 .users-box{
   display: inline-block;
   margin-top: 20px;
-  text-align: center; 
-  vertical-align: top; 
+  text-align: center;
+  vertical-align: top;
   max-width: 104px;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -325,7 +325,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
   font-size: 12px;
   border-top: 1px solid #ddd;
   display: inline-block;
-	
+
 	img {
 	  max-width:200px;
 	  max-height:60px;
@@ -380,7 +380,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 
 		&.active {
 			color: #558;
-			
+
 			text-shadow: 0 0 1em #aaf, 0 0 1em #aaf, 0 0 1em #aaf;
 			-webkit-animation:glow 1.5s infinite linear;
 				    animation:glow 1.5s infinite linear;
@@ -511,7 +511,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 			color: white;
 			height: 200px;
 		}
-		
+
 		.imagedrop {
 			text-align: center;
 			color: white;
@@ -525,7 +525,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 			vertical-align: middle;
 			display: none;
 		}
-		
+
 		.imagelist {
 			position: absolute;
 			bottom: 50px;
@@ -534,13 +534,13 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 			div {
 				margin-right:5px;
 			}
-			
+
 			span {
 				line-height:20px;
 				float:left;
 			}
-			
-			button { 
+
+			button {
 				padding-left:5px;
 			}
 		}
@@ -574,7 +574,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 #mobile-menu, #mobile-menu-overlay {
 	z-index: 999;
 
-	@media (min-width: 979px) 
+	@media (min-width: 979px)
 	{
 		display: none !important;
 	}
@@ -666,7 +666,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 		transition: margin-top 250ms ease;
 
 		margin-top: 20%;
-		
+
 
 		&.menu-visible {
 			margin-top: 0%;
@@ -690,7 +690,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 
 .category-box {
   height:90px;
-  
+
   .post-preview {
     padding-left:10px;
     padding-right:10px;
@@ -700,7 +700,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
       height:60px;
       padding-right:5px;
     }
-    
+
     p {
       overflow: hidden;
       text-overflow:ellipsis;
@@ -764,28 +764,32 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 .category-slider-2:hover {
   position:relative;
 
-  -webkit-animation: scroll-2 10s ease 0.5s infinite normal;    
+  -webkit-animation: scroll-2 10s ease 0.5s infinite normal;
   animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */
 }
 
 .category-slider-1:hover {
   position:relative;
 
-  -webkit-animation: scroll-1 8s ease 0.5s infinite normal;    
+  -webkit-animation: scroll-1 8s ease 0.5s infinite normal;
   animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */
 }
 
 .category-slider-0:hover {
   position:relative;
 
-  -webkit-animation: scroll-0 6s ease 0.5s infinite normal;    
+  -webkit-animation: scroll-0 6s ease 0.5s infinite normal;
   animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */
 }
 
-.form-search {
-	float: left;
-	margin-top: 5px;
-	margin-bottom: 5px;
+// go into header
+.navbar {
+	.form-search {
+		float: left;
+		margin-top: 8px;
+		margin-bottom: 5px;
+	}
+
 }
 
 .search-result-post {
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 7eecd62f4a..eaa4539820 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -50,9 +50,9 @@
 						<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
 						<small>
 							<strong><i class="{topics.pin-icon}"></i><i class="{topics.lock-icon}"></i></strong>
-							Posted {topics.relativeTime} ago by 
+							Posted {topics.relativeTime} ago by
 							<strong>{topics.username}</strong>.
-						</small> 
+						</small>
 					</div>
 				</div>
 			</div>
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 68b31758a7..837a732b10 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -85,19 +85,19 @@
 						</ul>
 					</li>
 					<li>
-						<form id="search-form" class="form-search form-inline" action="" method="GET">
+						<form id="search-form" class="form-search form-inline visible-md visible-lg" action="" method="GET">
 							<input type="text" name="query" class="form-control search-query" />
 							<button type="submit" class="btn hide">Search</button>
 						</form>
 					</li>
-					
+
 				</ul>
 			</div>
 		</div>
 	</div>
-	
+
 	<input id="csrf_token" type="hidden" template-variable="csrf" value="{csrf}" />
 
-	
+
 	<div class="container" id="content">
 
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 45ce6f7f7c..0c98be05ce 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -12,7 +12,7 @@
 </ol>
 
 <ul id="post-container" class="post-container container" data-tid="{topic_id}">
-	
+
 
 
 	<!-- BEGIN main_posts -->
@@ -34,17 +34,17 @@
 					<hr />
 
 					<div class="topic-buttons pull-left">
-						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn edit {main_posts.display_moderator_tools}" type="button" title="Edit"><i class="icon-pencil"></i></button>
-						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}" type="button" title="Delete"><i class="icon-trash"></i></button>
+						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn btn-default edit {main_posts.display_moderator_tools}" type="button" title="Edit"><i class="icon-pencil"></i></button>
+						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn btn-default delete {main_posts.display_moderator_tools}" type="button" title="Delete"><i class="icon-trash"></i></button>
 						<div class="btn-group">
-							<button class="btn follow" type="button" title="Be notified of new replies in this topic"><i class="icon-eye-open"></i></button>
-							<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn {main_posts.fav_button_class}" type="button">
+							<button class="btn btn-default follow" type="button" title="Be notified of new replies in this topic"><i class="icon-eye-open"></i></button>
+							<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn btn-default {main_posts.fav_button_class}" type="button">
 								<span>Favourite</span>
 								<span class="post_rep_{main_posts.pid}">{main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i>
 							</button>
 						</div>
 						<div class="btn-group">
-							<button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn quote" type="button" title="Quote"><i class="icon-quote-left"></i></button>
+							<button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn btn-default quote" type="button" title="Quote"><i class="icon-quote-left"></i></button>
 							<button class="btn btn-primary btn post_reply" type="button">Reply <i class="icon-reply"></i></button>
 						</div>
 					</div>
@@ -85,7 +85,7 @@
 					<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
 					<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div>
 				</div>
-				<span class="label label-danger {posts.show_banned}">banned</span>			
+				<span class="label label-danger {posts.show_banned}">banned</span>
 			</div>
 			<div class="span11 col-md-12-tablet">
 				<div class="post-block speech-bubble">