diff --git a/public/less/admin/manage/groups.less b/public/less/admin/manage/groups.less
index 7713a63479..03f42694d9 100644
--- a/public/less/admin/manage/groups.less
+++ b/public/less/admin/manage/groups.less
@@ -1,5 +1,5 @@
 .groups {
-	> ul {
+	#groups-list {
 		padding-left: 0;
 
 		> li {
diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl
index 05d0baa554..224598baf4 100644
--- a/src/views/admin/manage/groups.tpl
+++ b/src/views/admin/manage/groups.tpl
@@ -1,42 +1,54 @@
-<h1><i class="fa fa-group"></i> Groups</h1>
-
-<div>
-	<button class="btn btn-primary" id="create">New Group</button>
-</div>
-
-<hr />
-
 <div class="groups">
-	<ul id="groups-list">
-	<!-- BEGIN groups -->
-		<li data-groupname="{groups.name}">
-			<div class="row">
-				<div class="col-lg-8">
-					<h2>
-						{groups.name}
-						<!-- IF groups.system -->
-						<span class="badge">System Group</span>
-						<!-- ENDIF groups.system -->
-					</h2>
-					<p>{groups.description}</p>
+	<div class="col-sm-9">
+		<div class="panel panel-default">
+			<div class="panel-heading"><i class="fa fa-group"></i> Groups List</div>
+			<div class="panel-body">	
+				<ul id="groups-list">
+				<!-- BEGIN groups -->
+					<li data-groupname="{groups.name}">
+						<div class="row">
+							<div class="col-lg-8">
+								<h2>
+									{groups.name}
+									<!-- IF groups.system -->
+									<span class="badge">System Group</span>
+									<!-- ENDIF groups.system -->
+								</h2>
+								<p>{groups.description}</p>
 
-					<div class="btn-group">
-						<button class="btn btn-default" data-action="members">Edit</button>
-						<!-- IF groups.deletable -->
-						<button class="btn btn-danger" data-action="delete">Delete Group</button>
-						<!-- ENDIF groups.deletable -->
-					</div>
-				</div>
-				<div class="col-lg-4">
-					<ul class="pull-right members">
-					<!-- BEGIN members --><li data-uid="{groups.members.uid}" data-toggle="tooltip" title="{groups.members.username}"><img src="{groups.members.picture}" /></li><!-- END members -->
-					<!-- IF groups.truncated --><li data-toggle="tooltip" title="Total: {groups.memberCount}" class="more"><i class="fa fa-users fa-2x"></i></li><!-- ENDIF groups.truncated -->
-					</ul>
+								<div class="btn-group">
+									<button class="btn btn-default" data-action="members">Edit</button>
+									<!-- IF groups.deletable -->
+									<button class="btn btn-danger" data-action="delete">Delete Group</button>
+									<!-- ENDIF groups.deletable -->
+								</div>
+							</div>
+							<div class="col-lg-4">
+								<ul class="pull-right members">
+								<!-- BEGIN members --><li data-uid="{groups.members.uid}" data-toggle="tooltip" title="{groups.members.username}"><img src="{groups.members.picture}" /></li><!-- END members -->
+								<!-- IF groups.truncated --><li data-toggle="tooltip" title="Total: {groups.memberCount}" class="more"><i class="fa fa-users fa-2x"></i></li><!-- ENDIF groups.truncated -->
+								</ul>
+							</div>
+						</div>
+					</li>
+				<!-- END groups -->
+				</ul>				
+			</div>
+		</div>
+	</div>
+
+	<div class="col-lg-3">
+		<div class="panel panel-default">
+			<div class="panel-heading">Groups Control Panel</div>
+			<div class="panel-body">
+				<div>
+					<button class="btn btn-primary" id="create">New Group</button>
 				</div>
 			</div>
-		</li>
-	<!-- END groups -->
-	</ul>
+		</div>
+	</div>
+
+
 
 	<div class="modal fade" id="create-modal">
 		<div class="modal-dialog">
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 2cf10687b3..38c395631d 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -1,7 +1,7 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
 <div class="panel panel-default">
-	<div class="panel-heading">User Settings</div>
+	<div class="panel-heading">User List</div>
 	<div class="panel-body">
 		<form role="form">
 			<div class="checkbox">