3 files changed, 8 insertions, 7 deletions
diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index fbede8ff57..4d30729809 100644
--- a/modules/luci-base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
@@ -25,7 +25,7 @@
 		requestpath    = luci.dispatcher.context.requestpath,
 		dispatchpath   = luci.dispatcher.context.path,
 		pollinterval   = luci.config.main.pollinterval or 5,
-		ubuspath       = luci.config.main.ubuspath or '/ubus',
+		ubuspath       = luci.config.main.ubuspath or '/ubus/',
 		sessionid      = luci.dispatcher.context.authsession,
 		apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30),
 		apply_holdoff  = math.max(applyconf and applyconf.holdoff or 4, 1),
diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm
index 9b0e2de780..0bca0af5ec 100644
--- a/modules/luci-base/luasrc/view/sysauth.htm
+++ b/modules/luci-base/luasrc/view/sysauth.htm
@@ -35,8 +35,8 @@
 	</div>
 
 	<div class="cbi-page-actions">
-		<input type="submit" value="<%:Login%>" class="cbi-button cbi-button-apply" />
-		<input type="reset" value="<%:Reset%>" class="cbi-button cbi-button-reset" />
+		<input type="submit" value="<%:Login%>" class="btn cbi-button cbi-button-apply" />
+		<input type="reset" value="<%:Reset%>" class="btn cbi-button cbi-button-reset" />
 	</div>
 </form>
 <script type="text/javascript">//<![CDATA[
diff --git a/modules/luci-base/luasrc/view/view.htm b/modules/luci-base/luasrc/view/view.htm
index 9220ecf299..b451e8cfbf 100644
--- a/modules/luci-base/luasrc/view/view.htm
+++ b/modules/luci-base/luasrc/view/view.htm
@@ -2,10 +2,11 @@
 
 <div id="view">
 	<div class="spinning"><%:Loading view…%></div>
-	<script type="text/javascript">L.require('view.<%=view%>').catch(function(err) {
-		L.dom.content(document.querySelector('#view'), null);
-		L.error(err);
-	});</script>
+	<script type="text/javascript">
+		L.require('ui').then(function(ui) {
+			ui.instantiateView('<%=view%>');
+		});
+	</script>
 </div>
 
 <%+footer%>