diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index e5c6ecc8..fc9b94ea 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.8.1
-PKG_RELEASE:=209
+PKG_RELEASE:=210
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/luasrc/view/passwall/log/log.htm b/luci-app-passwall/luasrc/view/passwall/log/log.htm
index 83836942..7afc934a 100644
--- a/luci-app-passwall/luasrc/view/passwall/log/log.htm
+++ b/luci-app-passwall/luasrc/view/passwall/log/log.htm
@@ -1,5 +1,6 @@
 <%
 local api = require "luci.passwall.api"
+local section_tag = api.is_js_luci() and "div" or "fieldset"
 -%>
 <%+header%>
 <script type="text/javascript">
@@ -40,8 +41,8 @@ local api = require "luci.passwall.api"
 	);
 	//]]>
 </script>
-<fieldset class="cbi-section" id="_log_fieldset">
+<<%=section_tag%> class="cbi-section" id="_log_fieldset">
 	<input class="btn cbi-button cbi-button-remove" type="button" onclick="clearlog()" value="<%:Clear logs%>" />
 	<textarea id="log_textarea" class="cbi-input-textarea" style="width: 100%;margin-top: 10px;" data-update="change" rows="40" wrap="off" readonly="readonly"></textarea>
-</fieldset>
+</<%=section_tag%>>
 <%+footer%>
diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
index 85eb3e85..98d77bdd 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
@@ -1,6 +1,8 @@
 <%
 local api = require "luci.passwall.api"
 local appname = api.appname
+local is_js_luci = api.is_js_luci()
+local section_tag = is_js_luci and "div" or "fieldset"
 -%>
 <script src="<%=resource%>/view/<%=appname%>/Sortable.min.js?v=1.15.7"></script>
 
@@ -364,7 +366,7 @@ table td, .table .td {
 </style>
 
 <script type="text/javascript">
-<% if api.is_js_luci() then -%>
+<% if is_js_luci then -%>
 	var cbi_t = [];
 	function cbi_t_add(section, tab) {
 		var t = document.getElementById('tab.' + section + '.' + tab);
@@ -1286,7 +1288,7 @@ table td, .table .td {
 </div>
 
 <script type="text/template" id="nodes-table-template">
-	<fieldset class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-nodes-{{group}}-fieldset">
+	<<%=section_tag%> class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-nodes-{{group}}-fieldset">
 		<table class="table cbi-section-table" id="cbi-<%=appname%>-nodes-{{group}}-table" style="">
 			<tr class="tr cbi-section-table-titles anonymous">
 				<th class="th cbi-section-table-cell" style="width:20px">
@@ -1304,7 +1306,7 @@ table td, .table .td {
 			<input class="cbi-button cbi-button-add" type="button" value="<%:Add%>" onclick="node_action('add')">
 			<input class="cbi-button cbi-button-apply" style="display: none" type="button" id="save_order_btn_{{group}}" value="<%:Save Order%>" onclick="save_current_page_order('{{group}}')">
 		</div>
-	</fieldset>
+	</<%=section_tag%>>
 </script>
 
 <script type="text/template" id="node-tr-template">
@@ -1332,8 +1334,8 @@ table td, .table .td {
 	</tr>
 </script>
 
-<fieldset class="cbi-section" id="node_list">
-</fieldset>
+<<%=section_tag%> class="cbi-section" id="node_list">
+</<%=section_tag%>>
 
 <script type="text/javascript">
 	//init logic
@@ -1492,7 +1494,7 @@ table td, .table .td {
 
 			function addTabDOM(li, content) {
 				let tab_ul_html = '<ul class="cbi-tabmenu">';
-				let tab_content_html = '<fieldset class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-nodes">';
+				let tab_content_html = '<<%=section_tag%> class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-nodes">';
 				if (li) {
 					tab_ul_html += li;
 				}
@@ -1500,7 +1502,7 @@ table td, .table .td {
 					tab_content_html += content;
 				}
 				tab_ul_html += '</ul>';
-				tab_content_html += '</fieldset>';
+				tab_content_html += '</<%=section_tag%>>';
 				return tab_ul_html + tab_content_html;
 			}
 
diff --git a/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm b/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm
index 66c7cae0..e3c694cc 100644
--- a/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm
+++ b/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm
@@ -2,6 +2,9 @@
 local api = require "luci.passwall.api"
 local appname = api.appname
 local uci = api.uci
+local is_js_luci = api.is_js_luci()
+local section_tag = is_js_luci and "div" or "fieldset"
+local title_tag = is_js_luci and "h3" or "legend"
 -%>
 <script src="<%=resource%>/view/<%=appname%>/Sortable.min.js"></script>
 
@@ -326,7 +329,7 @@ table td, .table .td {
 
 
 <script type="text/template" id="shunt_rules-table-template">
-	<fieldset class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-shunt_rules-{{group}}-fieldset">
+	<<%=section_tag%> class="cbi-section cbi-tblsection" id="cbi-<%=appname%>-shunt_rules-{{group}}-fieldset">
 		<table class="table cbi-section-table" id="cbi-<%=appname%>-shunt_rules-{{group}}-table" style="">
 			<tr class="tr cbi-section-table-titles anonymous">
 				<th class="th cbi-section-table-cell" style="width:30%">ID</th>
@@ -340,7 +343,7 @@ table td, .table .td {
 			<input class="cbi-button cbi-button-add" type="button" value="<%:Add%>" onclick="toPage('add')">
 			<input class="cbi-button cbi-button-apply" style="display: none" type="button" id="save_order_btn_{{group}}" value="<%:Save Order%>" onclick="save_current_page_order('{{group}}')">
 		</div>
-	</fieldset>
+	</<%=section_tag%>>
 </script>
 
 <script type="text/template" id="shunt_rule-tr-template">
@@ -358,11 +361,11 @@ table td, .table .td {
 	</tr>
 </script>
 
-<div class="cbi-section">
-	<h3>Sing-Box/Xray <%:Shunt Rule%></h3>
+<<%=section_tag%> class="cbi-section">
+	<<%=title_tag%>>Sing-Box/Xray <%:Shunt Rule%></<%=title_tag%>>
 	<div class="cbi-section-descr"><a style="color: red"><%:Please note attention to the priority, the higher the order, the higher the priority.%></a></div>
 	<div id="shunt_rule_list"></div>
-</div>
+</<%=section_tag%>>
 
 <script type="text/javascript">
 	function loadNodeList() {
@@ -428,7 +431,7 @@ table td, .table .td {
 			
 			function addTabDOM(li, content) {
 				let tab_ul_html = '<ul class="cbi-tabmenu">';
-				let tab_content_html = '<fieldset class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-shunt_rules">';
+				let tab_content_html = '<<%=section_tag%> class="cbi-section-shunt_rule cbi-section-shunt_rule-tabbed" id="cbi-<%=appname%>-shunt_rules">';
 				if (li) {
 					tab_ul_html += li;
 				}
@@ -436,7 +439,7 @@ table td, .table .td {
 					tab_content_html += content;
 				}
 				tab_ul_html += '</ul>';
-				tab_content_html += '</fieldset>';
+				tab_content_html += '</<%=section_tag%>>';
 				return tab_ul_html + tab_content_html;
 			}