diff --git a/templates/partials/users_list_menu.tpl b/templates/partials/users_list_menu.tpl
index 19146cc..216604b 100644
--- a/templates/partials/users_list_menu.tpl
+++ b/templates/partials/users_list_menu.tpl
@@ -4,12 +4,4 @@
 	<!-- IF !reputation:disabled -->
 	<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
 	<!-- ENDIF !reputation:disabled -->
-	<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
-	<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
-	<!-- ENDIF function.displayUserSearch -->
-	<!-- IF inviteOnly -->
-	<!-- IF loggedIn -->
-	<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
-	<!-- ENDIF loggedIn -->
-	<!-- ENDIF inviteOnly -->
 </ul>
\ No newline at end of file
diff --git a/templates/users.tpl b/templates/users.tpl
index af62f10..d45ac3a 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -2,17 +2,29 @@
 
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<!-- IMPORT partials/users_list_menu.tpl -->
-
-	<br />
-
-	<div class="search {search_display}">
-		<div class="input-group">
-			<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
-			<span class="input-group-addon">
-				<span id="user-notfound-notify"><i class="fa fa-search"></i></span>
-			</span>
+	<div class="row">
+		<div class="col-lg-6">
+		<!-- IMPORT partials/users_list_menu.tpl -->
+		</div>
+		<div class="col-lg-3">
+			<!-- IF inviteOnly -->
+			<!-- IF loggedIn -->
+			<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
+			<!-- ENDIF loggedIn -->
+			<!-- ENDIF inviteOnly -->
+		</div>
+		<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
+		<div class="col-lg-3">
+			<div class="search">
+				<div class="input-group">
+					<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
+					<span class="input-group-addon">
+						<i class="fa fa-search"></i>
+					</span>
+				</div>
+			</div>
 		</div>
+		<!-- ENDIF function.displayUserSearch -->
 	</div>
 
 	<ul id="users-container" class="users-container">