diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index a93606529c..de0cd15e62 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -1,11 +1,9 @@
-<div class="manage-users">
-
+<div class="row manage-users">
 	<div class="col-lg-12">
 		<div class="panel panel-default">
 			<div class="panel-heading"><i class="fa fa-user"></i> Users</div>
 			<div class="panel-body">
 
-
 				<div class="clearfix">
 					<div class="btn-group pull-right">
 						<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">Edit <span class="caret"></span></button>
@@ -53,7 +51,7 @@
 
 				<br />
 
-				<div class="search {search_display} well">
+				<div class="search {search_display}">
 					<label>By User Name</label>
 					<input class="form-control" id="search-user-name" data-search-type="username" type="text" placeholder="Enter a username to search"/><br />
 
@@ -73,39 +71,41 @@
 				<a href="{config.relative_path}/admin/manage/users/inactive?months=12" class="btn btn-default">12 months</a>
 				<!-- ENDIF inactive -->
 
-				<table class="table table-striped users-table">
-					<tr>
-						<th><input component="user/select/all" type="checkbox"/></th>
-						<th>uid</th>
-						<th>username</th>
-						<th>email</th>
-						<th class="text-right">postcount</th>
-						<th class="text-right">reputation</th>
-						<th class="text-right">flags</th>
-						<th>joined</th>
-						<th>last online</th>
-						<th>banned</th>
-					</tr>
-					<!-- BEGIN users -->
-					<tr class="user-row">
-						<th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
-						<td class="text-right">{users.uid}</td>
-						<td><i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i><a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a></td>
-
-						<td>
-						<!-- IF config.requireEmailConfirmation -->
-						<i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
-						<i class="notvalidated fa fa-times text-danger<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
-						<!-- ENDIF config.requireEmailConfirmation --> {users.email}</td>
-						<td class="text-right">{users.postcount}</td>
-						<td class="text-right">{users.reputation}</td>
-						<td class="text-right"><!-- IF users.flags -->{users.flags}<!-- ELSE -->0<!-- ENDIF users.flags --></td>
-						<td><span class="timeago" title="{users.joindateISO}"></span></td>
-						<td><span class="timeago" title="{users.lastonlineISO}"></span></td>
-						<td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td>
-					</tr>
-					<!-- END users -->
-				</table>
+				<div class="table-responsive">
+					<table class="table table-striped users-table">
+						<tr>
+							<th><input component="user/select/all" type="checkbox"/></th>
+							<th>uid</th>
+							<th>username</th>
+							<th>email</th>
+							<th class="text-right">postcount</th>
+							<th class="text-right">reputation</th>
+							<th class="text-right">flags</th>
+							<th>joined</th>
+							<th>last online</th>
+							<th>banned</th>
+						</tr>
+						<!-- BEGIN users -->
+						<tr class="user-row">
+							<th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
+							<td class="text-right">{users.uid}</td>
+							<td><i class="administrator fa fa-shield text-success<!-- IF !users.administrator --> hidden<!-- ENDIF !users.administrator -->"></i><a href="{config.relative_path}/user/{users.userslug}"> {users.username}</a></td>
+	
+							<td>
+							<!-- IF config.requireEmailConfirmation -->
+							<i class="validated fa fa-check text-success<!-- IF !users.email:confirmed --> hidden<!-- ENDIF !users.email:confirmed -->" title="validated"></i>
+							<i class="notvalidated fa fa-times text-danger<!-- IF users.email:confirmed --> hidden<!-- ENDIF users.email:confirmed -->" title="not validated"></i>
+							<!-- ENDIF config.requireEmailConfirmation --> {users.email}</td>
+							<td class="text-right">{users.postcount}</td>
+							<td class="text-right">{users.reputation}</td>
+							<td class="text-right"><!-- IF users.flags -->{users.flags}<!-- ELSE -->0<!-- ENDIF users.flags --></td>
+							<td><span class="timeago" title="{users.joindateISO}"></span></td>
+							<td><span class="timeago" title="{users.lastonlineISO}"></span></td>
+							<td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td>
+						</tr>
+						<!-- END users -->
+					</table>
+				</div>
 
 				<!-- IMPORT partials/paginator.tpl -->
 			</div>