diff --git a/src/ffluci/view/cbi/footer.htm b/src/ffluci/view/cbi/footer.htm
index 0629bd6d60..2acf710cdd 100644
--- a/src/ffluci/view/cbi/footer.htm
+++ b/src/ffluci/view/cbi/footer.htm
@@ -1,5 +1,7 @@
-			<input type="submit" value="<%:save Speichern%>" />
-			<input type="reset" value="<%:reset Zurücksetzen%>" />
-			<script type="text/javascript">cbi_d_init();</script>
+			<div>
+				<input type="submit" value="<%:save Speichern%>" />
+				<input type="reset" value="<%:reset Zurücksetzen%>" />
+				<script type="text/javascript">cbi_d_init();</script>
+			</div>
 		</form>
 <%+footer%>
\ No newline at end of file
diff --git a/src/ffluci/view/cbi/header.htm b/src/ffluci/view/cbi/header.htm
index e926b20916..20b4aac7ff 100644
--- a/src/ffluci/view/cbi/header.htm
+++ b/src/ffluci/view/cbi/header.htm
@@ -1,5 +1,7 @@
 <%+header%>
 		<form method="post" action="<%=os.getenv("REQUEST_URI")%>">
-			<script type="text/javascript" src="<%=media%>/cbi.js"></script>
-			<input type="hidden" name="cbi.submit" value="1" />
-			<input type="submit" value="<%:cbi_save Speichern%>" class="hidden" />
+			<div>
+				<script type="text/javascript" src="<%=media%>/cbi.js"></script>
+				<input type="hidden" name="cbi.submit" value="1" />
+				<input type="submit" value="<%:cbi_save Speichern%>" class="hidden" />
+			</div>
diff --git a/src/ffluci/view/cbi/nsection.htm b/src/ffluci/view/cbi/nsection.htm
index c1f4c8bf3a..90dbb30414 100644
--- a/src/ffluci/view/cbi/nsection.htm
+++ b/src/ffluci/view/cbi/nsection.htm
@@ -17,12 +17,12 @@
 								<option><%:cbi_selopt *** Zusätzliche Parameter ***%></option>
 							<% for key, val in pairs(self.optionals[self.section]) do %>
 								<option id="cbi-<%=self.config.."-"..self.section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option>
-								<% if #val.deps > 0 then %><script type="text/javascript">
-										<% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..self.section.."-"..val.option%>", "cbid.<%=self.config.."."..self.section.."."..d.field%>", "<%=d.value%>");
-										<% end %>
-								</script><% end %>
 							<% end %>
 							</select>
+							<script type="text/javascript"><% for key, val in pairs(self.optionals[self.section]) do %>
+								<% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..self.section.."-"..val.option%>", "cbid.<%=self.config.."."..self.section.."."..d.field%>", "<%=d.value%>");
+								<% end %><% end %>
+							<% end %></script>
 						<% end %>
 						</div>
 					<% end %>
diff --git a/src/ffluci/view/cbi/tsection.htm b/src/ffluci/view/cbi/tsection.htm
index 15272f05f6..ffeb91575b 100644
--- a/src/ffluci/view/cbi/tsection.htm
+++ b/src/ffluci/view/cbi/tsection.htm
@@ -17,12 +17,12 @@
 									<option><%:cbi_addopt -- Feld --%></option>
 								<% for key, val in pairs(self.optionals[k]) do %>
 									<option id="cbi-<%=self.config.."-"..k.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option>
-									<% if #val.deps > 0 then %><script type="text/javascript">
-										<% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..k.."-"..val.option%>", "cbid.<%=self.config.."."..k.."."..d.field%>", "<%=d.value%>");
-										<% end %>
-									</script><% end %>
 								<% end %>
 								</select>
+								<script type="text/javascript"><% for key, val in pairs(self.optionals[k]) do %>
+									<% if #val.deps > 0 then %><% for j, d in ipairs(val.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..k.."-"..val.option%>", "cbid.<%=self.config.."."..k.."."..d.field%>", "<%=d.value%>");
+								<% end %><% end %>
+								<% end %></script>
 							<% end %>
 								<input type="submit" value="<%:add hinzufügen%>" />
 							</div>
diff --git a/src/ffluci/view/header.htm b/src/ffluci/view/header.htm
index db5570515b..66495da43c 100644
--- a/src/ffluci/view/header.htm
+++ b/src/ffluci/view/header.htm
@@ -11,6 +11,8 @@ require("ffluci.http").htmlheader()
 <head>
 	<link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
 	<link rel="stylesheet" type="text/css" href="<%=media%>/css/<%=req.category%>_<%=req.module%>.css" />
+	<meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" />
+	<meta http-equiv="content-script-type" content="text/javascript" />
 	<title>FFLuCI</title>
 </head>
 <body>
