diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 27af0709fa..62e09eb965 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -37,6 +37,7 @@ var adminController = {
 	settings: {},
 	logger: {},
 	sounds: {},
+	homepage: {},
 	navigation: {},
 	themes: {},
 	users: require('./admin/users'),
@@ -255,6 +256,10 @@ adminController.navigation.get = function(req, res, next) {
 	});
 };
 
+adminController.homepage.get = function(req, res, next) {
+	res.render('admin/general/homepage', {});
+};
+
 adminController.settings.get = function(req, res, next) {
 	var term = req.params.term ? req.params.term : 'general';
 
diff --git a/src/routes/admin.js b/src/routes/admin.js
index a9c3ecc6ff..85a3a8ddc5 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -44,6 +44,7 @@ function addRoutes(router, middleware, controllers) {
 	router.get('/general/languages', controllers.admin.languages.get);
 	router.get('/general/sounds', controllers.admin.sounds.get);
 	router.get('/general/navigation', controllers.admin.navigation.get);
+	router.get('/general/homepage', controllers.admin.homepage.get);
 
 	router.get('/manage/categories', controllers.admin.categories.active);
 	router.get('/manage/categories/active', controllers.admin.categories.active);
diff --git a/src/views/admin/general/homepage.tpl b/src/views/admin/general/homepage.tpl
new file mode 100644
index 0000000000..f784e64ce2
--- /dev/null
+++ b/src/views/admin/general/homepage.tpl
@@ -0,0 +1,31 @@
+<div class="col-lg-9">	
+	<div class="panel panel-default">
+		<div class="panel-heading">Home Page</div>
+		<div class="panel-body">
+			<form>
+				<label>Home Page Route</label>
+				<select class="form-control" data-field="homePageRoute">
+					<option value="categories">Categories</option>
+					<option value="recent">Recent</option>
+					<option value="popular">Popular</option>
+				</select>
+			</form>
+		</div>
+	</div>
+</div>
+
+<div class="col-lg-3 acp-sidebar">
+	<div class="panel panel-default">
+		<div class="panel-heading">Save Settings</div>
+		<div class="panel-body">
+			<button class="btn btn-primary btn-md" id="save">Save Changes</button>
+			<button class="btn btn-warning btn-md" id="revert">Revert Changes</button>
+		</div>
+	</div>
+</div>
+
+<script>
+	require(['admin/settings'], function(Settings) {
+		Settings.prepare();
+	});
+</script>
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 37fbd6f017..dcf28ba45e 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -2,9 +2,10 @@
 					<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/dashboard">Dashboard</a></li>
+						<li><a href="{relative_path}/admin/general/homepage">Home Page</a></li>
+						<li><a href="{relative_path}/admin/general/navigation">Navigation</a></li>
 						<li><a href="{relative_path}/admin/general/languages">Languages</a></li>
 						<li><a href="{relative_path}/admin/general/sounds">Sounds</a></li>
-						<li><a href="{relative_path}/admin/general/navigation">Navigation</a></li>
 					</ul>
 				</div>
 				<div class="sidebar-nav">
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index b403835994..063d7c34e7 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -28,21 +28,6 @@
 	</div>
 </div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">Home Page</div>
-	<div class="panel-body">
-		<form>
-			<label>Home Page Route</label>
-			<select class="form-control" data-field="homePageRoute">
-				<option value="categories">Categories</option>
-				<option value="recent">Recent</option>
-				<option value="popular">Popular</option>
-			</select>
-		</form>
-	</div>
-</div>
-
-
 <div class="panel panel-default">
 	<div class="panel-heading">Site Logo</div>
 	<div class="panel-body">