diff --git a/public_html/media/css/tag-list.css b/public_html/media/css/tag-list.css
index 63e23c12..cb6b5954 100644
--- a/public_html/media/css/tag-list.css
+++ b/public_html/media/css/tag-list.css
@@ -30,11 +30,11 @@
 }
 form.aligned {
 	text-align: left;
-	margin: 2em auto;
+	margin: 0 auto;
 }
 form.aligned label.left {
 	width: 7em;
 }
 form h1 {
-	text-align: center;
+	display: none;
 }
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
index 3f44e437..356ad8a0 100644
--- a/src/Controllers/TagController.php
+++ b/src/Controllers/TagController.php
@@ -7,7 +7,9 @@ class TagController
 	public function listAction()
 	{
 		$this->context->stylesheets []= 'tag-list.css';
+		$this->context->stylesheets []= 'tabs.css';
 		$this->context->subTitle = 'tags';
+		$this->context->viewName = 'tag-list-wrapper';
 
 		PrivilegesHelper::confirmWithException(Privilege::ListTags);
 		$suppliedFilter = InputHelper::get('filter');
@@ -26,6 +28,11 @@ class TagController
 	*/
 	public function mergeAction()
 	{
+		$this->context->stylesheets []= 'tag-list.css';
+		$this->context->stylesheets []= 'tabs.css';
+		$this->context->subTitle = 'tags';
+		$this->context->viewName = 'tag-list-wrapper';
+
 		PrivilegesHelper::confirmWithException(Privilege::MergeTags);
 		if (InputHelper::get('submit'))
 		{
@@ -61,6 +68,11 @@ class TagController
 	*/
 	public function renameAction()
 	{
+		$this->context->stylesheets []= 'tag-list.css';
+		$this->context->stylesheets []= 'tabs.css';
+		$this->context->subTitle = 'tags';
+		$this->context->viewName = 'tag-list-wrapper';
+
 		PrivilegesHelper::confirmWithException(Privilege::MergeTags);
 		if (InputHelper::get('submit'))
 		{
@@ -84,6 +96,11 @@ class TagController
 	*/
 	public function massTagRedirectAction()
 	{
+		$this->context->stylesheets []= 'tag-list.css';
+		$this->context->stylesheets []= 'tabs.css';
+		$this->context->subTitle = 'tags';
+		$this->context->viewName = 'tag-list-wrapper';
+
 		PrivilegesHelper::confirmWithException(Privilege::MassTag);
 		if (InputHelper::get('submit'))
 		{
diff --git a/src/Views/tag-list-wrapper.phtml b/src/Views/tag-list-wrapper.phtml
new file mode 100644
index 00000000..82feaed5
--- /dev/null
+++ b/src/Views/tag-list-wrapper.phtml
@@ -0,0 +1,41 @@
+<?php $tabs = [] ?>
+<?php if (PrivilegesHelper::confirm(Privilege::ListTags)) $tabs['list'] = 'List'; ?>
+<?php if (PrivilegesHelper::confirm(Privilege::RenameTags)) $tabs['rename'] = 'Rename'; ?>
+<?php if (PrivilegesHelper::confirm(Privilege::MergeTags)) $tabs['merge'] = 'Merge'; ?>
+<?php if (PrivilegesHelper::confirm(Privilege::MassTag)) $tabs['mass-tag-redirect'] = 'Mass tag'; ?>
+
+<?php if (count(array_diff($tabs, ['list'])) > 1): ?>
+	<div class="tabs">
+		<nav>
+			<ul>
+				<?php foreach ($tabs as $tab => $name): ?>
+					<?php if ($this->context->route->simpleActionName == $tab): ?>
+						<li class="selected <?php echo $tab ?>">
+					<?php else: ?>
+						<li class="<?php echo $tab ?>">
+					<?php endif ?>
+						<a href="<?php echo \Chibi\UrlHelper::route('tag', $tab) ?>">
+							<?php echo $name ?>
+						</a>
+					</li>
+				<?php endforeach  ?>
+			</ul>
+		</nav>
+	</div>
+<?php endif ?>
+
+<?php if ($this->context->route->simpleActionName == 'merge'): ?>
+	<?php $this->renderFile('tag-merge') ?>
+<?php endif ?>
+
+<?php if ($this->context->route->simpleActionName == 'rename'): ?>
+	<?php $this->renderFile('tag-rename') ?>
+<?php endif ?>
+
+<?php if ($this->context->route->simpleActionName == 'list'): ?>
+	<?php $this->renderFile('tag-list') ?>
+<?php endif ?>
+
+<?php if ($this->context->route->simpleActionName == 'mass-tag-redirect'): ?>
+	<?php $this->renderFile('tag-mass-tag') ?>
+<?php endif ?>
diff --git a/src/Views/tag-list.phtml b/src/Views/tag-list.phtml
index 0880821a..cf3338f3 100644
--- a/src/Views/tag-list.phtml
+++ b/src/Views/tag-list.phtml
@@ -15,15 +15,3 @@
 		<?php endforeach ?>
 	</ul>
 </div>
-
-<?php if (PrivilegesHelper::confirm(Privilege::MergeTags)): ?>
-	<?php $this->renderFile('tag-merge') ?>
-<?php endif ?>
-
-<?php if (PrivilegesHelper::confirm(Privilege::RenameTags)): ?>
-	<?php $this->renderFile('tag-rename') ?>
-<?php endif ?>
-
-<?php if (PrivilegesHelper::confirm(Privilege::MassTag)): ?>
-	<?php $this->renderFile('tag-mass-tag') ?>
-<?php endif ?>