diff --git a/src/views/admin/tags.tpl b/src/views/admin/tags.tpl
index 17e45113cf..93120df7a7 100644
--- a/src/views/admin/tags.tpl
+++ b/src/views/admin/tags.tpl
@@ -5,31 +5,36 @@
 	</div>
 	<!-- ENDIF !tags.length -->
 
-	<input class="form-control" type="text" id="tag-search" placeholder="Search"/><br/>
+	<div class="panel panel-default">
+		<div class="panel-heading">Tag Management</div>
+		<div class="panel-body">
+			<input class="form-control" type="text" id="tag-search" placeholder="Search"/><br/>
 
 
-	<div class="row">
-		<p>Click on a tag to modify its background and text colours</p>
-		<div class="tag-list">
-			<!-- BEGIN tags -->
-			<div class="tag-row" data-tag="{tags.value}">
-				<div data-value="{tags.value}">
-					<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span><span class="tag-topic-count">{tags.score}</span>
-				</div>
-				<div class="tag-modal hidden">
-					<div class="form-group">
-						<label for="bgColor">Background Colour</label>
-						<input id="bgColor" placeholder="#ffffff" data-name="bgColor" value="{tags.bgColor}" class="form-control category_bgColor" />
-					</div>
-					<div class="col-sm-3 col-xs-12">
-						<div class="form-group">
-							<label for="color">Text Colour</label>
-							<input id="color" placeholder="#a2a2a2" data-name="color" value="{tags.color}" class="form-control category_color" />
+			<div class="row">
+				<p>Click on a tag to modify its background and text colours</p>
+				<div class="tag-list">
+					<!-- BEGIN tags -->
+					<div class="tag-row" data-tag="{tags.value}">
+						<div data-value="{tags.value}">
+							<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span><span class="tag-topic-count">{tags.score}</span>
+						</div>
+						<div class="tag-modal hidden">
+							<div class="form-group">
+								<label for="bgColor">Background Colour</label>
+								<input id="bgColor" placeholder="#ffffff" data-name="bgColor" value="{tags.bgColor}" class="form-control category_bgColor" />
+							</div>
+							<div class="col-sm-3 col-xs-12">
+								<div class="form-group">
+									<label for="color">Text Colour</label>
+									<input id="color" placeholder="#a2a2a2" data-name="color" value="{tags.color}" class="form-control category_color" />
+								</div>
+							</div>
 						</div>
 					</div>
+					<!-- END tags -->
 				</div>
 			</div>
-			<!-- END tags -->
 		</div>
 	</div>
 </div>
\ No newline at end of file