diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 46aee6a7..b2f424a1 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -108,6 +108,13 @@ def get_locale():
 @util.flask.cached(refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values)
 def index():
 
+	#~~ a bunch of settings
+
+	enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"])
+	enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"]))
+	enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0
+	enable_accesscontrol = userManager is not None
+
 	#~~ extract data from asset plugins
 
 	asset_plugins = pluginManager.get_implementations(octoprint.plugin.AssetPlugin)
@@ -126,10 +133,12 @@ def index():
 	#~~ navbar
 
 	templates["navbar"]["entries"] = dict(
-		settings=dict(template="navbar/settings.jinja2", _div="navbar_settings", styles=["display: none"], data_bind="visible: loginState.isAdmin", custom_bindings=False),
-		systemmenu=dict(template="navbar/systemmenu.jinja2", _div="navbar_systemmenu", styles=["display: none"], classes=["dropdown"], data_bind="visible: loginState.isAdmin", custom_bindings=False),
-		login=dict(template="navbar/login.jinja2", _div="navbar_login", classes=["dropdown"], custom_bindings=False)
+		settings=dict(template="navbar/settings.jinja2", _div="navbar_settings", styles=["display: none"], data_bind="visible: loginState.isAdmin", custom_bindings=False)
 	)
+	if enable_accesscontrol:
+		templates["navbar"]["entries"]["login"] = dict(template="navbar/login.jinja2", _div="navbar_login", classes=["dropdown"], custom_bindings=False)
+	if enable_systemmenu:
+		templates["navbar"]["entries"]["systemmenu"] = dict(template="navbar/systemmenu.jinja2", _div="navbar_systemmenu", styles=["display: none"], classes=["dropdown"], data_bind="visible: loginState.isAdmin", custom_bindings=False),
 
 	#~~ sidebar
 
@@ -144,10 +153,12 @@ def index():
 	templates["tab"]["entries"] = dict(
 		temperature=(gettext("Temperature"), dict(template="tabs/temperature.jinja2", _div="temp")),
 		control=(gettext("Control"), dict(template="tabs/control.jinja2", _div="control")),
-		gcodeviewer=(gettext("GCode Viewer"), dict(template="tabs/gcodeviewer.jinja2", _div="gcode")),
 		terminal=(gettext("Terminal"), dict(template="tabs/terminal.jinja2", _div="term")),
-		timelapse=(gettext("Timelapse"), dict(template="tabs/timelapse.jinja2", _div="timelapse"))
 	)
+	if enable_gcodeviewer:
+		templates["tab"]["entries"]["gcodeviewer"] = (gettext("GCode Viewer"), dict(template="tabs/gcodeviewer.jinja2", _div="gcode"))
+	if enable_timelapse:
+		templates["tab"]["entries"]["timelapse"] = (gettext("Timelapse"), dict(template="tabs/timelapse.jinja2", _div="timelapse"))
 
 	#~~ settings dialog
 
@@ -163,7 +174,6 @@ def index():
 
 		features=(gettext("Features"), dict(template="dialogs/settings/features.jinja2", _div="settings_features", custom_bindings=False)),
 		webcam=(gettext("Webcam"), dict(template="dialogs/settings/webcam.jinja2", _div="settings_webcam", custom_bindings=False)),
-		accesscontrol=(gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False)),
 		api=(gettext("API"), dict(template="dialogs/settings/api.jinja2", _div="settings_api", custom_bindings=False)),
 
 		section_octoprint=(gettext("OctoPrint"), None),
@@ -172,6 +182,8 @@ def index():
 		appearance=(gettext("Appearance"), dict(template="dialogs/settings/appearance.jinja2", _div="settings_appearance", custom_bindings=False)),
 		logs=(gettext("Logs"), dict(template="dialogs/settings/logs.jinja2", _div="settings_logs")),
 	)
+	if enable_accesscontrol:
+		templates["settings"]["entries"]["accesscontrol"] = (gettext("Access Control"), dict(template="dialogs/settings/accesscontrol.jinja2", _div="settings_users", custom_bindings=False))
 
 	#~~ extract data from template plugins
 
@@ -252,10 +264,7 @@ def index():
 
 	render_kwargs = dict(
 		webcamStream=settings().get(["webcam", "stream"]),
-		enableTimelapse=(settings().get(["webcam", "snapshot"]) is not None and settings().get(["webcam", "ffmpeg"]) is not None),
-		enableGCodeVisualizer=settings().get(["gcodeViewer", "enabled"]),
 		enableTemperatureGraph=settings().get(["feature", "temperatureGraph"]),
-		enableSystemMenu=settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0,
 		enableAccessControl=userManager is not None,
 		enableSdSupport=settings().get(["feature", "sdSupport"]),
 		firstRun=settings().getBoolean(["server", "firstRun"]) and (userManager is None or not userManager.hasBeenCustomized()),
diff --git a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2 b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2
index 2420017e..0ab00fdb 100644
--- a/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2
+++ b/src/octoprint/templates/dialogs/settings/accesscontrol.jinja2
@@ -1,4 +1,3 @@
-{% if enableAccessControl %}
 <table class="table table-condensed table-hover" id="system_users">
     <thead>
     <tr>
@@ -161,4 +160,3 @@
         <button class="btn btn-primary" data-bind="click: function() { $root.users.confirmChangePassword(); }, enable: !$root.users.editorPasswordMismatch()">{{ _('Confirm') }}</button>
     </div>
 </div>
-{% endif %}
diff --git a/src/octoprint/templates/navbar/login.jinja2 b/src/octoprint/templates/navbar/login.jinja2
index 1b776aaf..f7e25593 100644
--- a/src/octoprint/templates/navbar/login.jinja2
+++ b/src/octoprint/templates/navbar/login.jinja2
@@ -1,4 +1,3 @@
-{% if enableAccessControl %}
 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
     <i class="icon-user"></i> <span data-bind="text: loginState.userMenuText">{{ _('Login') }}</span>
     <b class="caret"></b>
@@ -17,4 +16,3 @@
     <li><a href="#" id="change_password_button" data-bind="click: function() { users.showChangePasswordDialog(loginState.currentUser()); }">{{ _('Change Password') }}</a></li>
     <li><a href="#" id="logout_button" data-bind="click: loginState.logout">{{ _('Logout') }}</a></li>
 </ul>
-{% endif %}
diff --git a/src/octoprint/templates/navbar/systemmenu.jinja2 b/src/octoprint/templates/navbar/systemmenu.jinja2
index b14c83c3..0e8ba5a1 100644
--- a/src/octoprint/templates/navbar/systemmenu.jinja2
+++ b/src/octoprint/templates/navbar/systemmenu.jinja2
@@ -1,4 +1,3 @@
-{% if enableSystemMenu %}
 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
     <i class="icon-off"></i> {{ _('System') }}
     <b class="caret"></b>
@@ -6,4 +5,3 @@
 <ul class="dropdown-menu" data-bind="foreach: systemActions">
     <li><a href="#" data-bind="click: $root.triggerAction, text: name"></a></li>
 </ul>
-{% endif %}
diff --git a/src/octoprint/templates/tabs/gcodeviewer.jinja2 b/src/octoprint/templates/tabs/gcodeviewer.jinja2
index ad986db7..7c9385a1 100644
--- a/src/octoprint/templates/tabs/gcodeviewer.jinja2
+++ b/src/octoprint/templates/tabs/gcodeviewer.jinja2
@@ -1,4 +1,3 @@
-{% if enableGCodeVisualizer %}
 <div data-bind="visible: !waitForApproval()">
     <input id="gcode_slider_layers" type="text">
     <canvas id="gcode_canvas" width="568" height="568"></canvas>
@@ -74,4 +73,3 @@
         Yes, please visualize <span data-bind="text: selectedFile.name"></span> regardless of its size
     </button>
 </div>
-{% endif %}
diff --git a/src/octoprint/templates/tabs/timelapse.jinja2 b/src/octoprint/templates/tabs/timelapse.jinja2
index e3d187e0..5c24d750 100644
--- a/src/octoprint/templates/tabs/timelapse.jinja2
+++ b/src/octoprint/templates/tabs/timelapse.jinja2
@@ -1,69 +1,67 @@
-{% if enableTimelapse %}
-    <div style="display: none;" data-bind="visible: loginState.isUser">
-        <h1>{{ _('Timelapse Configuration') }}</h1>
+<div style="display: none;" data-bind="visible: loginState.isUser">
+    <h1>{{ _('Timelapse Configuration') }}</h1>
 
-        <label for="webcam_timelapse_mode">{{ _('Timelapse Mode') }}</label>
-        <select id="webcam_timelapse_mode" data-bind="value: timelapseType, enable: isOperational() && !isPrinting() && loginState.isUser()">
-            <option value="off">{{ _('Off') }}</option>
-            <option value="zchange">{{ _('On Z Change') }}</option>
-            <option value="timed">{{ _('Timed') }}</option>
-        </select>
+    <label for="webcam_timelapse_mode">{{ _('Timelapse Mode') }}</label>
+    <select id="webcam_timelapse_mode" data-bind="value: timelapseType, enable: isOperational() && !isPrinting() && loginState.isUser()">
+        <option value="off">{{ _('Off') }}</option>
+        <option value="zchange">{{ _('On Z Change') }}</option>
+        <option value="timed">{{ _('Timed') }}</option>
+    </select>
 
-        <label for="webcam_timelapse_postRoll">{{ _('Timelapse post roll (in rendered seconds)') }}</label>
+    <label for="webcam_timelapse_postRoll">{{ _('Timelapse post roll (in rendered seconds)') }}</label>
+    <div class="input-append">
+        <input type="text" class="input-mini" id="webcam_timelapse_postRoll" data-bind="value: timelapsePostRoll, valueUpdate: 'afterkeydown', enable: isOperational() && !isPrinting() && loginState.isUser() && timelapseTypeSelected()">
+        <span class="add-on">{{ _('sec') }}</span>
+    </div>
+
+    <div id="webcam_timelapse_timedsettings" data-bind="visible: intervalInputEnabled">
+        <label for="webcam_timelapse_interval">{{ _('Interval') }}</label>
         <div class="input-append">
-            <input type="text" class="input-mini" id="webcam_timelapse_postRoll" data-bind="value: timelapsePostRoll, valueUpdate: 'afterkeydown', enable: isOperational() && !isPrinting() && loginState.isUser() && timelapseTypeSelected()">
+            <input type="text" class="input-mini" id="webcam_timelapse_interval" data-bind="value: timelapseTimedInterval, valueUpdate: 'afterkeydown', enable: isOperational() && !isPrinting() && loginState.isUser()">
             <span class="add-on">{{ _('sec') }}</span>
         </div>
-
-        <div id="webcam_timelapse_timedsettings" data-bind="visible: intervalInputEnabled">
-            <label for="webcam_timelapse_interval">{{ _('Interval') }}</label>
-            <div class="input-append">
-                <input type="text" class="input-mini" id="webcam_timelapse_interval" data-bind="value: timelapseTimedInterval, valueUpdate: 'afterkeydown', enable: isOperational() && !isPrinting() && loginState.isUser()">
-                <span class="add-on">{{ _('sec') }}</span>
-            </div>
-        </div>
-
-        <div data-bind="visible: loginState.isAdmin">
-            <label class="checkbox">
-                <input type="checkbox" data-bind="checked: persist"> {{ _('Save as default') }}
-            </label>
-        </div>
-
-        <div>
-            <button class="btn" data-bind="click: save, enable: saveButtonEnabled">{{ _('Save config') }}</button>
-        </div>
     </div>
 
-    <h1>{{ _('Finished Timelapses') }}</h1>
+    <div data-bind="visible: loginState.isAdmin">
+        <label class="checkbox">
+            <input type="checkbox" data-bind="checked: persist"> {{ _('Save as default') }}
+        </label>
+    </div>
 
-    <div class="pull-right">
-        <small>{{ _('Sort by') }}: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">{{ _('Name') }} ({{ _('ascending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">{{ _('Creation date') }} ({{ _('descending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">{{ _('Size') }} ({{ _('descending') }})</a></small>
+    <div>
+        <button class="btn" data-bind="click: save, enable: saveButtonEnabled">{{ _('Save config') }}</button>
     </div>
-    <table class="table table-striped table-hover table-condensed table-hover" id="timelapse_files">
-        <thead>
-        <tr>
-            <th class="timelapse_files_name">{{ _('Name') }}</th>
-            <th class="timelapse_files_size">{{ _('Size') }}</th>
-            <th class="timelapse_files_action">{{ _('Action') }}</th>
-        </tr>
-        </thead>
-        <tbody data-bind="foreach: listHelper.paginatedItems">
-        <tr data-bind="attr: {title: name}">
-            <td class="timelapse_files_name" data-bind="text: name"></td>
-            <td class="timelapse_files_size" data-bind="text: size"></td>
-            <td class="timelapse_files_action"><a href="#" class="icon-trash" data-bind="click: function() { if ($root.loginState.isUser()) { $parent.removeFile($data.name); } else { return; } }, css: {disabled: !$root.loginState.isUser()}"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a></td>
-        </tr>
-        </tbody>
-    </table>
-    <div class="pagination pagination-mini pagination-centered">
-        <ul>
-            <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="#" data-bind="click: listHelper.prevPage">«</a></li>
-        </ul>
-        <ul data-bind="foreach: listHelper.pages">
-            <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
-        </ul>
-        <ul>
-            <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
-        </ul>
-    </div>
-{% endif %}
+</div>
+
+<h1>{{ _('Finished Timelapses') }}</h1>
+
+<div class="pull-right">
+    <small>{{ _('Sort by') }}: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">{{ _('Name') }} ({{ _('ascending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">{{ _('Creation date') }} ({{ _('descending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">{{ _('Size') }} ({{ _('descending') }})</a></small>
+</div>
+<table class="table table-striped table-hover table-condensed table-hover" id="timelapse_files">
+    <thead>
+    <tr>
+        <th class="timelapse_files_name">{{ _('Name') }}</th>
+        <th class="timelapse_files_size">{{ _('Size') }}</th>
+        <th class="timelapse_files_action">{{ _('Action') }}</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach: listHelper.paginatedItems">
+    <tr data-bind="attr: {title: name}">
+        <td class="timelapse_files_name" data-bind="text: name"></td>
+        <td class="timelapse_files_size" data-bind="text: size"></td>
+        <td class="timelapse_files_action"><a href="#" class="icon-trash" data-bind="click: function() { if ($root.loginState.isUser()) { $parent.removeFile($data.name); } else { return; } }, css: {disabled: !$root.loginState.isUser()}"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a></td>
+    </tr>
+    </tbody>
+</table>
+<div class="pagination pagination-mini pagination-centered">
+    <ul>
+        <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="#" data-bind="click: listHelper.prevPage">«</a></li>
+    </ul>
+    <ul data-bind="foreach: listHelper.pages">
+        <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
+    </ul>
+    <ul>
+        <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
+    </ul>
+</div>