diff --git a/doc/lucky1.png b/doc/lucky1.png
new file mode 100644
index 00000000..a5b41b6e
Binary files /dev/null and b/doc/lucky1.png differ
diff --git a/doc/lucky2.png b/doc/lucky2.png
new file mode 100644
index 00000000..ba4c026f
Binary files /dev/null and b/doc/lucky2.png differ
diff --git a/doc/lucky3.png b/doc/lucky3.png
new file mode 100644
index 00000000..6fa7982f
Binary files /dev/null and b/doc/lucky3.png differ
diff --git a/doc/taskplan1.png b/doc/taskplan1.png
deleted file mode 100644
index 1f8db7be..00000000
Binary files a/doc/taskplan1.png and /dev/null differ
diff --git a/doc/taskplan2.png b/doc/taskplan2.png
deleted file mode 100644
index edb45d6d..00000000
Binary files a/doc/taskplan2.png and /dev/null differ
diff --git a/doc/taskplan3.png b/doc/taskplan3.png
deleted file mode 100644
index d4794702..00000000
Binary files a/doc/taskplan3.png and /dev/null differ
diff --git a/doc/view.png b/doc/view.png
deleted file mode 100644
index 169e112f..00000000
Binary files a/doc/view.png and /dev/null differ
diff --git a/doc/view2.png b/doc/view2.png
deleted file mode 100644
index 9058c632..00000000
Binary files a/doc/view2.png and /dev/null differ
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
index 9cd2194b..4b0f89cd 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua
@@ -7,7 +7,10 @@ local gfwlist_path = path .. "gfwlist"
 local chnlist_path = path .. "chnlist"
 local chnroute_path = path .. "chnroute"
 
-m = Map(api.appname)
+api.set_default_cbi()
+
+m = Map()
+m.apply_on_parse = true
 
 function clean_text(text)
 	local nbsp = string.char(0xC2, 0xA0) -- 不间断空格（U+00A0）
@@ -314,7 +317,7 @@ if fs.access(chnroute_path) then
 	]], translate("Read List"))
 end
 
-m:append(Template(api.appname .. "/rule_list/js"))
+m:appendTemplate("/rule_list/js")
 
 local geo_dir = (api.uci_get_c("@global_rules[0]", "v2ray_location_asset") or "/usr/share/v2ray/"):match("^(.*)/")
 local geosite_path = geo_dir .. "/geosite.dat"
@@ -324,7 +327,7 @@ if api.finded_com("geoview") and fs.access(geosite_path) and fs.access(geoip_pat
 		s:tab("geoview", translate("Geo View"))
 		o = s:taboption("geoview", DummyValue, "_geoview_fieldset")
 		o.rawhtml = true
-		o.template = api.appname .. "/rule_list/geoview"
+		o.template = m:template_path("/rule_list/geoview")
 	end
 end
 
@@ -332,4 +335,4 @@ m.on_before_save = function(self)
 	m:set("@global[0]", "flush_set", "1")
 end
 
-return m
+return api.return_map(m)
diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
index 1630bb19..ad55a1da 100644
--- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua
+++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
@@ -2063,7 +2063,9 @@ function gen_config(var)
 								fakedns_dns_rule.query_type = { "A", "AAAA" }
 							end
 							fakedns_dns_rule.server = fakedns_tag
+							fakedns_dns_rule.rewrite_ttl = 1
 							fakedns_dns_rule.disable_cache = true
+							fakedns_dns_rule.client_subnet = nil
 							table.insert(dns.rules, fakedns_dns_rule)
 						end
 					end
@@ -2098,7 +2100,7 @@ function gen_config(var)
 					query_type = dns_rule_query_type,
 					server = fakedns_tag,
 					disable_cache = true,
-					rewrite_ttl = 30
+					rewrite_ttl = 1
 				}
 				table.insert(dns.rules, fakedns_dns_rule)
 			end
diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm b/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
index 3e780819..9ec5b613 100644
--- a/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
+++ b/luci-app-passwall/luasrc/view/passwall/cbi/footer.htm
@@ -23,8 +23,8 @@ local map = self.map
 <% if luci.http.formvalue("cbi.apply") == "1" and map.is_js_luci then -%>
 <script type="text/javascript">
 	document.addEventListener("luci-loaded", function() {
-		L.env.apply_display = 2; //Write whatever you want, it's all just a fake progress bar anyway.
-		L.env.apply_holdoff = 1;
+		//L.env.apply_display = 2; //Write whatever you want, it's all just a fake progress bar anyway.
+		//L.env.apply_holdoff = 1;
 
 		let tt;
 		let flag = 2;
@@ -50,10 +50,12 @@ local map = self.map
 		}
 
 		window.setTimeout(() => {
-			<% if not map.redirect then -%>
+			if (tt)
 				window.clearTimeout(tt);
-				L.ui.changes.displayStatus(false);
-				window.location = window.location.href.split('#')[0];
+			L.ui.changes.displayStatus(false);
+			<% if not map.redirect then -%>
+				//window.location = window.location.href.split('#')[0];
+				window.location = "<%=map.api.url("log")%>";
 			<%- else %>
 				window.location.href = "<%=map.redirect%>";
 			<%- end %>
diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
index 3d8ae3c1..f15a1860 100644
--- a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
+++ b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
@@ -1,5 +1,6 @@
 <%
-local api = require "luci.passwall.api"
+local map = self.map
+local api = map.api
 -%>
 
 <style>
diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm
index bc9679f7..20db271c 100644
--- a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm
+++ b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm
@@ -1,5 +1,6 @@
 <%
-local api = require "luci.passwall.api"
+local map = self.map
+local api = map.api
 -%>
 <script type="text/javascript">
 	//<![CDATA[