diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
index 773522fb1..0f154441c 100644
--- a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
+++ b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
@@ -5,25 +5,12 @@
  Licensed to the public under the Apache License 2.0.
 -%>
 
-<%
-	local ver = require "luci.version"
-	local disp = require "luci.dispatcher"
-	local request  = disp.context.path
-	local category = request[1]
-	local tree = disp.node()
-	local categories = disp.node_childs(tree)
-%>
+<% local ver = require "luci.version" %>
+
    <footer>
     <a href="https://github.com/openwrt/luci">Powered by <%= ver.distversion %>
-    <% if #categories > 1 then %>
-     <ul class="breadcrumb pull-right" id="modemenu">
-	    <% for i, r in ipairs(categories) do %>
-		    <li<% if request[1] == r then %> class="active"<%end%>><a href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a> <span class="divider">|</span></li>
-	    <% end %>
-     </ul>
-    <% end %>
+    <ul class="breadcrumb pull-right" id="modemenu" style="display:none"></ul>
    </footer>
-   </div>
   </div>
  </body>
 </html>
diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
index 7e3056cf4..37b208ee5 100644
--- a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
+++ b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
@@ -13,124 +13,11 @@
 
 	local boardinfo = util.ubus("system", "board")
 
-	local request  = disp.context.path
-	local request2 = disp.context.request
-
-	local category = request[1]
-	local cattree  = category and disp.node(category)
-
-	local leaf = request2[#request2]
-
-	local tree = disp.node()
 	local node = disp.context.dispatched
 
-	local categories = disp.node_childs(tree)
-
-	local c = tree
-	local i, r
-
-	-- tag all nodes leading to this page
-	for i, r in ipairs(request) do
-		if c.nodes and c.nodes[r] then
-			c = c.nodes[r]
-			c._menu_selected = true
-		end
-	end
-
 	-- send as HTML5
 	http.prepare_content("text/html")
 
-	local function nodeurl(prefix, name, query)
-		local u = url(prefix, name)
-		if query then
-			u = u .. http.build_querystring(query)
-		end
-		return pcdata(u)
-	end
-
-	local function render_tabmenu(prefix, node, level)
-		if not level then
-			level = 1
-		end
-
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			if level > 2 then
-				write('<ul class="tabs">')
-			end
-
-			local selected_node
-			local selected_name
-			local i, v
-
-			for i, v in ipairs(childs) do
-				local nnode = node.nodes[v]
-				if nnode._menu_selected then
-					selected_node = nnode
-					selected_name = v
-				end
-
-				if level > 2 then
-					write('<li class="tabmenu-item-%s %s"><a href="%s">%s</a></li>' %{
-						v, (nnode._menu_selected or (node.leaf and v == leaf)) and 'active' or '',
-						nodeurl(prefix, v, nnode.query),
-						striptags(translate(nnode.title))
-					})
-				end
-			end
-
-			if level > 2 then
-				write('</ul>')
-			end
-
-			if selected_node then
-				render_tabmenu(prefix .. "/" .. selected_name, selected_node, level + 1)
-			end
-		end
-	end
-
-	local function render_submenu(prefix, node)
-		local childs = disp.node_childs(node)
-		if #childs > 0 then
-			write('<ul class="dropdown-menu">')
-
-			for i, r in ipairs(childs) do
-				local nnode = node.nodes[r]
-				write('<li><a href="%s">%s</a></li>' %{
-					nodeurl(prefix, r, nnode.query),
-					striptags(translate(nnode.title))
-				})
-			end
-
-			write('</ul>')
-		end
-	end
-
-	local function render_topmenu()
-		local childs = disp.node_childs(cattree)
-		if #childs > 0 then
-			write('<ul class="nav">')
-
-			for i, r in ipairs(childs) do
-				local nnode = cattree.nodes[r]
-				local grandchildren = disp.node_childs(nnode)
-
-				if #grandchildren > 0 then
-					write('<li class="dropdown"><a class="menu" href="#">%s</a>' % pcdata(striptags(translate(nnode.title))))
-					render_submenu(category .. "/" .. r, nnode)
-					write('</li>')
-				else
-					write('<li><a href="%s">%s</a></li>' %{
-						nodeurl(category, r, nnode.query),
-						pcdata(striptags(translate(nnode.title)))
-					})
-				end
-			end
-
-			write('</ul>')
-		end
-	end
-
 	-- Get current and latest OMR version
 	local current_omr_version = luci.model.uci.cursor():get("openmptcprouter","settings","version") or ""
 	local latest_omr_version = luci.model.uci.cursor():get("openmptcprouter","latest_versions","omr") or ""
@@ -144,23 +31,26 @@
 		<meta name="viewport" content="initial-scale=1.0">
 		<link rel="stylesheet" href="<%=media%>/cascade.css">
 		<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" />
-		<link rel="icon" type="image/png" href="<%=media%>/favicon.png">
+		<link rel="shortcut icon" type="image/png" href="<%=media%>/favicon.png">
 		<% if node and node.css then %>
 			<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
 		<% end -%>
 		<% if css then %>
 			<style title="text/css"><%= css %></style>
 		<% end -%>
+		<script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
 		<script src="<%=resource%>/cbi.js"></script>
 		<script src="<%=resource%>/xhr.js"></script>
+
+		<% include("themes/openmptcprouter/json-menu") %>
 	</head>
 
-	<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %>">
+	<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><%- end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
 		<header>
 			<div class="fill">
 				<div class="container">
 					<a class="brand" href="#" alt="OpenMPTCProuter"><img src="<%=resource%>/openmptcprouter/images/omr-logo.png" height="30" width="30" alt="OMR" /> OpenMPTCProuter</a>
-					<% render_topmenu() %>
+					<ul class="nav" id="topmenu" style="display:none"></ul>
 					<div class="pull-right">
 						<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
 							<span class="label success" id="xhr_poll_status_on"><%:Auto Refresh%> <%:on%></span>
@@ -176,7 +66,9 @@
 				<div class="alert-message warning">
 					<h4><%:No password set!%></h4>
 					<p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
-					<div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+					<% if disp.lookup("admin/system/admin") then %>
+						<div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+					<% end %>
 				</div>
 			<%- end -%>
 			<%- if current_omr_version ~= "" and latest_omr_version ~= "" and current_omr_version < latest_omr_version then -%>
@@ -193,4 +85,4 @@
 				</div>
 			</noscript>
 
-			<% if category then render_tabmenu(category, cattree) end %>
+			<div id="tabmenu" style="display:none"></div>
diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm
new file mode 100644
index 000000000..b38406f65
--- /dev/null
+++ b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm
@@ -0,0 +1,119 @@
+<script type="text/javascript">
+	(function() {
+		function get_children(node) {
+			var children = [];
+
+			for (var k in node.children) {
+				if (!node.children.hasOwnProperty(k))
+					continue;
+
+				if (!node.children[k].satisfied)
+					continue;
+
+				if (!node.children[k].hasOwnProperty('title'))
+					continue;
+
+				children.push(Object.assign(node.children[k], { name: k }));
+			}
+
+			return children.sort(function(a, b) {
+				return ((a.order || 1000) - (b.order || 1000));
+			});
+		}
+
+		function render_tabmenu(tree, url, level) {
+			var container = document.querySelector('#tabmenu'),
+			    ul = E('ul', { 'class': 'tabs' }),
+			    children = get_children(tree),
+			    activeNode = null;
+
+			for (var i = 0; i < children.length; i++) {
+				var isActive = (L.env.dispatchpath[3 + (level || 0)] == children[i].name),
+				    activeClass = isActive ? ' active' : '',
+				    className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+				ul.appendChild(E('li', { 'class': className }, [
+					E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )]));
+
+				if (isActive)
+					activeNode = children[i];
+			}
+
+			if (ul.children.length == 0)
+				return E([]);
+
+			container.appendChild(ul);
+			container.style.display = '';
+
+			if (activeNode)
+				render_tabmenu(activeNode, url + '/' + activeNode.name, (level || 0) + 1);
+
+			return ul;
+		}
+
+		function render_mainmenu(tree, url, level) {
+			var ul = level ? E('ul', { 'class': 'dropdown-menu' }) : document.querySelector('#topmenu'),
+			    children = get_children(tree);
+
+			if (children.length == 0 || level > 1)
+				return E([]);
+
+			for (var i = 0; i < children.length; i++) {
+				var submenu = render_mainmenu(children[i], url + '/' + children[i].name, (level || 0) + 1),
+				    subclass = (!level && submenu.firstElementChild) ? 'dropdown' : null,
+				    linkclass = (!level && submenu.firstElementChild) ? 'menu' : null,
+				    linkurl = submenu.firstElementChild ? '#' : L.url(url, children[i].name);
+
+				var li = E('li', { 'class': subclass }, [
+					E('a', { 'class': linkclass, 'href': linkurl }, [ _(children[i].title) ]),
+					submenu
+				]);
+
+				ul.appendChild(li);
+			}
+
+			ul.style.display = '';
+
+			return ul;
+		}
+
+		function render_modemenu(tree) {
+			var ul = document.querySelector('#modemenu'),
+			    children = get_children(tree);
+
+			for (var i = 0; i < children.length; i++) {
+				var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+				ul.appendChild(E('li', { 'class': isActive ? 'active' : null }, [
+					E('a', { 'href': L.url(children[i].name) }, [ _(children[i].title) ]),
+					' ',
+					E('span', { 'class': 'divider' }, [ '|' ])
+				]));
+
+				if (isActive)
+					render_mainmenu(children[i], children[i].name);
+			}
+
+			if (ul.children.length > 1)
+				ul.style.display = '';
+		}
+
+		document.addEventListener('luci-loaded', function(ev) {
+			var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
+			    node = tree,
+			    url = '';
+
+			render_modemenu(tree);
+
+			if (L.env.dispatchpath.length >= 3) {
+				for (var i = 0; i < 3 && node; i++) {
+					node = node.children[L.env.dispatchpath[i]];
+					url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+				}
+
+				if (node)
+					render_tabmenu(node, url);
+			}
+		});
+	})();
+</script>