diff --git a/public/src/forum/admin/general/index.js b/public/src/forum/admin/general/dashboard.js
similarity index 98%
rename from public/src/forum/admin/general/index.js
rename to public/src/forum/admin/general/dashboard.js
index e380bc7548..79ed4fc647 100644
--- a/public/src/forum/admin/general/index.js
+++ b/public/src/forum/admin/general/dashboard.js
@@ -1,7 +1,7 @@
 "use strict";
 /*global define, ajaxify, app, socket, RELATIVE_PATH*/
 
-define('forum/admin/general/index', ['semver'], function(semver) {
+define('forum/admin/general/dashboard', ['semver'], function(semver) {
 	var	Admin = {};
 	var updateIntervalId = 0;
 	Admin.init = function() {
diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 1681fe4ba1..3505f4b0ea 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -53,7 +53,7 @@ adminController.home = function(req, res, next) {
 		if (err) {
 			return next(err);
 		}
-		res.render('admin/general/index', {
+		res.render('admin/general/dashboard', {
 			version: pkg.version,
 			notices: results.notices,
 			stats: results.stats
@@ -150,7 +150,7 @@ adminController.tags.get = function(req, res, next) {
 			return next(err);
 		}
 
-		res.render('admin/managetags', {tags: tags});
+		res.render('admin/manage/tags', {tags: tags});
 	});
 };
 
diff --git a/src/routes/admin.js b/src/routes/admin.js
index 18ed447206..5093683824 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -36,7 +36,7 @@ function apiRouter(middleware, controllers) {
 }
 
 function addRoutes(router, middleware, controllers) {
-	router.get('/general/index', controllers.admin.home);
+	router.get('/general/dashboard', controllers.admin.home);
 	router.get('/general/languages', controllers.admin.languages.get);
 	router.get('/general/sounds', controllers.admin.sounds.get);
 
diff --git a/src/views/admin/general/index.tpl b/src/views/admin/general/dashboard.tpl
similarity index 100%
rename from src/views/admin/general/index.tpl
rename to src/views/admin/general/dashboard.tpl
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index b9bb517c51..0e5d77e08b 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -55,7 +55,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand nodebb-logo" href="{relative_path}/admin/general/index"><img src="{relative_path}/images/logo.png" alt="NodeBB ACP" /> Admin Control Panel <span id="breadcrumbs"></span></a>
+				<a class="navbar-brand nodebb-logo" href="{relative_path}/admin/general/dashboard"><img src="{relative_path}/images/logo.png" alt="NodeBB ACP" /> Admin Control Panel <span id="breadcrumbs"></span></a>
 			</div>
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav">
@@ -99,7 +99,7 @@
 				<div class="sidebar-nav">
 					<ul class="nav nav-list">
 						<li class="nav-header"><i class="fa fa-fw fa-dashboard"></i> General</li>
-						<li class="active"><a href="{relative_path}/admin/general/index">Dashboard</a></li>
+						<li class="active"><a href="{relative_path}/admin/general/dashboard">Dashboard</a></li>
 						<li><a href="{relative_path}/admin/general/languages">Languages</a></li>
 						<li><a href="{relative_path}/admin/general/sounds">Sounds</a></li>
 					</ul>
diff --git a/src/views/config.json b/src/views/config.json
index 6967dc6bd8..075189a68a 100644
--- a/src/views/config.json
+++ b/src/views/config.json
@@ -1,7 +1,7 @@
 {
 	"custom_mapping": {
 		"^\/?$": "home",
-		"^admin?$": "admin/index",
+		"^admin?$": "admin/general/dashboard",
 		"^users/sort-posts": "users",
 		"^users/latest": "users",
 		"^users/sort-reputation": "users",