diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index e503c0d418..6a2ddfa505 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -1,34 +1,29 @@
 <div class="tags">
 
 	<div class="col-lg-9">
-		<!-- IF !tags.length -->
-		<div class="alert alert-warning">
-			<strong>Your forum does not have any topics with tags yet!</strong>
-		</div>
-		<!-- ENDIF !tags.length -->
-		<div class="panel panel-default tag-management">
-			<div class="panel-heading">Tag Management</div>
-			<div class="panel-body">
-				<div class="row">
-					<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"><a href="{config.relative_path}/tags/{tags.value}" target="_blank">{tags.score}</a></span>
+		<div class="tag-management">
+			<!-- IF !tags.length -->
+			<h5>Your forum does not have any topics with tags yet.</h5>
+			<!-- ENDIF !tags.length -->
+			<div class="row">
+				<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"><a href="{config.relative_path}/tags/{tags.value}" target="_blank">{tags.score}</a></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="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="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 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>
-						<!-- END tags -->
 					</div>
+					<!-- END tags -->
 				</div>
 			</div>
 		</div>