diff --git a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/dashboard.js b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/dashboard.js
index 112db59e..f3dcc38b 100644
--- a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/dashboard.js
+++ b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/dashboard.js
@@ -4,6 +4,13 @@
 'require dom';
 'require ui';
 'require ndpid.api as api';
+'require secubox-theme/theme as Theme';
+'require secubox-portal/header as SbHeader';
+
+var lang = (typeof L !== 'undefined' && L.env && L.env.lang) ||
+	(document.documentElement && document.documentElement.getAttribute('lang')) ||
+	(navigator.language ? navigator.language.split('-')[0] : 'en');
+Theme.init({ language: lang });
 
 return view.extend({
 	title: _('nDPId Dashboard'),
@@ -444,7 +451,10 @@ return view.extend({
 		// Start polling
 		this.startPolling();
 
-		return view;
+		var wrapper = E('div', { 'class': 'secubox-page-wrapper' });
+		wrapper.appendChild(SbHeader.render());
+		wrapper.appendChild(view);
+		return wrapper;
 	},
 
 	handleSaveApply: null,
diff --git a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/flows.js b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/flows.js
index 5c33a52d..eda919bb 100644
--- a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/flows.js
+++ b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/flows.js
@@ -4,6 +4,13 @@
 'require dom';
 'require ui';
 'require ndpid.api as api';
+'require secubox-theme/theme as Theme';
+'require secubox-portal/header as SbHeader';
+
+var lang = (typeof L !== 'undefined' && L.env && L.env.lang) ||
+	(document.documentElement && document.documentElement.getAttribute('lang')) ||
+	(navigator.language ? navigator.language.split('-')[0] : 'en');
+Theme.init({ language: lang });
 
 return view.extend({
 	title: _('nDPId Flows'),
@@ -428,7 +435,10 @@ return view.extend({
 		// Start polling
 		this.startPolling();
 
-		return view;
+		var wrapper = E('div', { 'class': 'secubox-page-wrapper' });
+		wrapper.appendChild(SbHeader.render());
+		wrapper.appendChild(view);
+		return wrapper;
 	},
 
 	handleSaveApply: null,
diff --git a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/settings.js b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/settings.js
index 7cec383c..aaf6f12d 100644
--- a/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/settings.js
+++ b/package/secubox/luci-app-ndpid/htdocs/luci-static/resources/view/ndpid/settings.js
@@ -4,6 +4,13 @@
 'require uci';
 'require ui';
 'require ndpid.api as api';
+'require secubox-theme/theme as Theme';
+'require secubox-portal/header as SbHeader';
+
+var lang = (typeof L !== 'undefined' && L.env && L.env.lang) ||
+	(document.documentElement && document.documentElement.getAttribute('lang')) ||
+	(navigator.language ? navigator.language.split('-')[0] : 'en');
+Theme.init({ language: lang });
 
 return view.extend({
 	title: _('nDPId Settings'),
@@ -160,6 +167,11 @@ return view.extend({
 		o.value('vpn_udp', 'VPN (UDP)');
 		o.depends('enabled', '1');
 
-		return m.render();
+		return m.render().then(function(formEl) {
+			var wrapper = E('div', { 'class': 'secubox-page-wrapper' });
+			wrapper.appendChild(SbHeader.render());
+			wrapper.appendChild(formEl);
+			return wrapper;
+		});
 	}
 });