diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 25535dee7d..d0c72c9182 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -1,133 +1,135 @@
 <div class="row">
 	<form role="form" class="category" data-cid="{category.cid}">
-		<div class="col-md-9">
-			<div class="panel panel-default">
-				<div class="panel-heading"><i class="fa fa-folder"></i> Category Settings</div>
-				<div class="panel-body category-settings-form">
-					<fieldset>
-						<label for="cid-{category.cid}-name">Category Name</label>
-						<input id="cid-{category.cid}-name" type="text" class="form-control" placeholder="Category Name" data-name="name" value="{category.name}" /><br />
+		<ul class="nav nav-pills">
+			<li class="active"><a href="#category-settings" data-toggle="tab">Category Settings</a></li>
+			<li><a href="#privileges" data-toggle="tab">Privileges</a></li>
+		</ul>
+		<br />
+		<div class="tab-content">
+			<div class="tab-pane fade active in row" id="category-settings">
+				<div class="col-md-9">
+					<div class="category-settings-form">
+						<fieldset>
+							<label for="cid-{category.cid}-name">Category Name</label>
+							<input id="cid-{category.cid}-name" type="text" class="form-control" placeholder="Category Name" data-name="name" value="{category.name}" /><br />
 
-						<label for="cid-{category.cid}-description">Category Description</label>
-						<input id="cid-{category.cid}-description" data-name="description" placeholder="Category Description" value="{category.description}" class="form-control category_description description"></input><br />
-					</fieldset>
+							<label for="cid-{category.cid}-description">Category Description</label>
+							<input id="cid-{category.cid}-description" data-name="description" placeholder="Category Description" value="{category.description}" class="form-control category_description description"></input><br />
+						</fieldset>
 
-					<fieldset>
-						<div class="form-group">
-							<label for="cid-{category.cid}-parentCid">Parent Category</label>
-							<br/>
-							<div class="btn-group <!-- IF !category.parent.name -->hide<!-- ENDIF !category.parent.name-->">
-								<button type="button" class="btn btn-default" data-action="changeParent" data-parentCid="{category.parent.cid}"><i class="fa {category.parent.icon}"></i> {category.parent.name}</button>
-								<button type="button" class="btn btn-warning" data-action="removeParent" data-parentCid="{category.parent.cid}"><i class="fa fa-times"></i></button>
+						<fieldset class="row">
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-bgColor">Background Colour</label>
+									<input id="cid-{category.cid}-bgColor" placeholder="#0059b2" data-name="bgColor" value="{category.bgColor}" class="form-control category_bgColor" />
+								</div>
 							</div>
-							<button type="button" class="btn btn-default <!-- IF category.parent.name -->hide<!-- ENDIF category.parent.name-->" data-action="setParent"><i class="fa fa-sitemap"></i> (None)</button><br />
-						</div>
-					</fieldset>
-
-					<fieldset class="row">
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-bgColor">Background Colour</label>
-								<input id="cid-{category.cid}-bgColor" placeholder="#0059b2" data-name="bgColor" value="{category.bgColor}" class="form-control category_bgColor" />
-							</div>
-						</div>
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-color">Text Colour</label>
-								<input id="cid-{category.cid}-color" placeholder="#fff" data-name="color" value="{category.color}" class="form-control category_color" />
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-color">Text Colour</label>
+									<input id="cid-{category.cid}-color" placeholder="#fff" data-name="color" value="{category.color}" class="form-control category_color" />
+								</div>
 							</div>
-						</div>
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-imageClass">Background Image Size</label>
-									<select id="cid-{category.cid}-imageClass" class="form-control" data-name="imageClass" data-value="{category.imageClass}">
-									<option value="auto">auto</option>
-									<option value="cover">cover</option>
-									<option value="contain">contain</option>
-								</select>
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-imageClass">Background Image Size</label>
+										<select id="cid-{category.cid}-imageClass" class="form-control" data-name="imageClass" data-value="{category.imageClass}">
+										<option value="auto">auto</option>
+										<option value="cover">cover</option>
+										<option value="contain">contain</option>
+									</select>
+								</div>
+							</div><br />
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-class">Custom Class</label>
+									<input id="cid-{category.cid}-class" type="text" class="form-control" placeholder="col-md-6 col-xs-6" data-name="class" value="{category.class}" />
+								</div>
 							</div>
-						</div><br />
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-class">Custom Class</label>
-								<input id="cid-{category.cid}-class" type="text" class="form-control" placeholder="col-md-6 col-xs-6" data-name="class" value="{category.class}" />
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-numRecentReplies"># of Recent Replies</label>
+									<input id="cid-{category.cid}-numRecentReplies" type="text" class="form-control" placeholder="2" data-name="numRecentReplies" value="{category.numRecentReplies}" />
+								</div>
 							</div>
-						</div>
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-numRecentReplies"># of Recent Replies</label>
-								<input id="cid-{category.cid}-numRecentReplies" type="text" class="form-control" placeholder="2" data-name="numRecentReplies" value="{category.numRecentReplies}" />
+							<div class="col-sm-4 col-xs-12">
+								<div class="form-group">
+									<label for="cid-{category.cid}-link">External Link</label>
+									<input id="cid-{category.cid}-link" type="text" class="form-control" placeholder="http://domain.com" data-name="link" value="{category.link}" />
+								</div>
 							</div>
-						</div>
-						<div class="col-sm-4 col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-link">External Link</label>
-								<input id="cid-{category.cid}-link" type="text" class="form-control" placeholder="http://domain.com" data-name="link" value="{category.link}" />
-							</div>
-						</div>
-					</fieldset>
-				</div>
-			</div>
-
-			<div class="panel panel-default">
-				<div class="panel-heading"><i class="fa fa-key"></i> Privileges / Access Control</div>
-				<div class="panel-body">
-					<p>
-						You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or
-						a per-group basis. You can add a new user to this table by searching for them in the form below.
-					</p>
-					<p class="text-warning">
-						<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting
-						these settings.
-					</p>
-					<hr />
-					<div class="privilege-table-container">
-						<!-- IMPORT admin/partials/categories/privileges.tpl -->
+						</fieldset>
 					</div>
 				</div>
-			</div>
-		</div>
 
-		<div class="col-md-3 options acp-sidebar">
-			<div class="panel panel-default hidden-sm">
-				<div class="panel-heading">Preview</div>
-				<div class="panel-body">
-					<div class="category-preview" style="
-						<!-- IF category.backgroundImage -->background-image: url({category.backgroundImage});<!-- ENDIF category.backgroundImage -->
-						<!-- IF category.bgColor -->background-color: {category.bgColor};<!-- ENDIF category.bgColor -->
-						<!-- IF category.imageClass -->background-size: {category.imageClass};<!-- ENDIF category.imageClass -->
-						color: {category.color};
-					">
-						<div class="icon">
-							<i data-name="icon" value="{category.icon}" class="fa {category.icon} fa-2x"></i>
-						</div>
-					</div>
-					<div class="btn-group btn-group-justified">
-						<div class="btn-group">
-							<button type="button" data-cid="{category.cid}" data-name="image" data-value="{category.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Upload</button>
-						</div>
-						<!-- IF category.image -->
-						<div class="btn-group">
-							<button class="btn btn-warning delete-image"><i data-name="icon" value="fa-times" class="fa fa-times"></i> Remove</button>
+				<div class="col-md-3 options acp-sidebar">
+					<div class="panel panel-default">
+						<div class="panel-body">
+							<div class="category-preview" style="
+								<!-- IF category.backgroundImage -->background-image: url({category.backgroundImage});<!-- ENDIF category.backgroundImage -->
+								<!-- IF category.bgColor -->background-color: {category.bgColor};<!-- ENDIF category.bgColor -->
+								<!-- IF category.imageClass -->background-size: {category.imageClass};<!-- ENDIF category.imageClass -->
+								color: {category.color};
+							">
+								<div class="icon">
+									<i data-name="icon" value="{category.icon}" class="fa {category.icon} fa-2x"></i>
+								</div>
+							</div>
+							<div class="btn-group btn-group-justified">
+								<div class="btn-group">
+									<button type="button" data-cid="{category.cid}" data-name="image" data-value="{category.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Upload</button>
+								</div>
+								<!-- IF category.image -->
+								<div class="btn-group">
+									<button class="btn btn-warning delete-image"><i data-name="icon" value="fa-times" class="fa fa-times"></i> Remove</button>
+								</div>
+								<!-- ENDIF category.image -->
+							</div><br />
+						
+							<fieldset>
+								<div class="form-group text-center">
+									<label for="cid-{category.cid}-parentCid">Parent Category</label>
+									<br/>
+									<div class="btn-group <!-- IF !category.parent.name -->hide<!-- ENDIF !category.parent.name-->">
+										<button type="button" class="btn btn-default" data-action="changeParent" data-parentCid="{category.parent.cid}"><i class="fa {category.parent.icon}"></i> {category.parent.name}</button>
+										<button type="button" class="btn btn-warning" data-action="removeParent" data-parentCid="{category.parent.cid}"><i class="fa fa-times"></i></button>
+									</div>
+									<button type="button" class="btn btn-default btn-block <!-- IF category.parent.name -->hide<!-- ENDIF category.parent.name-->" data-action="setParent"><i class="fa fa-sitemap"></i> (None)</button>
+								</div>
+							</fieldset>
+
+							<hr />
+							<div class="btn-group btn-group-justified">
+								<div class="btn-group">
+									<button class="btn btn-primary save">Save</button>
+								</div>
+								<div class="btn-group">
+									<button class="btn btn-default revert">Revert</button>
+								</div>
+							</div>
+							<hr />
+							<button class="btn btn-danger btn-block purge"><i class="fa fa-eraser"></i> Purge Category</button>
 						</div>
-						<!-- ENDIF category.image -->
 					</div>
 				</div>
 			</div>
 
-			<div class="panel panel-default">
-				<div class="panel-heading">Categories Control Panel</div>
-				<div class="panel-body">
-					<div class="btn-group btn-group-justified">
-						<div class="btn-group">
-							<button class="btn btn-primary save">Save</button>
-						</div>
-						<div class="btn-group">
-							<button class="btn btn-default revert">Revert</button>
+			<div class="tab-pane fade col-xs-12" id="privileges">
+				<div class="panel panel-default">
+					<div class="panel-body">
+						<p>
+							You can configure the access control privileges for this category in this section. Privileges can be granted on a per-user or
+							a per-group basis. You can add a new user to this table by searching for them in the form below.
+						</p>
+						<p class="text-warning">
+							<strong>Note</strong>: Privilege settings take effect immediately. It is not necessary to save the category after adjusting
+							these settings.
+						</p>
+						<hr />
+						<div class="privilege-table-container">
+							<!-- IMPORT admin/partials/categories/privileges.tpl -->
 						</div>
 					</div>
-					<hr />
-					<button class="btn btn-danger btn-block purge"><i class="fa fa-eraser"></i> Purge Category</button>
 				</div>
 			</div>
 		</div>