diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
index 18ef42068b..e42193cffc 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -98,12 +98,12 @@ function cbi_combobox(id, values, def, man) {
 	obj.style.display = "none";
 
 	cbi_bind(sel, "change", function() {
-		obj.value = sel.options[sel.selectedIndex].value;
-
 		if (sel.selectedIndex == sel.options.length - 1) {
 			obj.style.display = "inline";
 			sel.parentNode.removeChild(sel);
 			obj.focus();
+		} else {
+			obj.value = sel.options[sel.selectedIndex].value;
 		}
 	})
 }
diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index cfee09f1c9..9d616255f3 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -31,9 +31,9 @@ end
 			<%- if not self.anonymous then -%>
 				<th>&nbsp;</th>
 			<%- end -%>
-			<%- for i, k in pairs(self.children) do -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
 				<th class="cbi-section-table-cell"><%=k.title%></th>
-			<%- count = count + 1; end; if self.extedit or self.addremove then -%>
+			<%- count = count + 1; end; end; if self.extedit or self.addremove then -%>
 				<th class="cbi-section-table-cell">&nbsp;</th>
 			<%- count = count + 1; end -%>
 			</tr>
@@ -41,9 +41,9 @@ end
 			<%- if not self.anonymous then -%>
 				<th>&nbsp;</th>
 			<%- end -%>
-			<%- for i, k in pairs(self.children) do -%>
+			<%- for i, k in pairs(self.children) do if not k.optional then -%>
 				<th class="cbi-section-table-cell"><%=k.description%></th>
-			<%- end; if self.extedit or self.addremove then -%>
+			<%- end; end; if self.extedit or self.addremove then -%>
 				<th class="cbi-section-table-cell">&nbsp;</th>
 			<%- end -%>
 			</tr>
@@ -57,7 +57,16 @@ end
 				<% if not self.anonymous then -%>
 					<th><h3><%=k%></h3></th>
 				<%- end %>
-				<%-+cbi/ucisection-%>
+
+
+				<%-
+					for k, node in ipairs(self.children) do
+						if not node.optional then
+							node:render(section, scope or {})
+						end
+					end
+				-%>
+
 				<%- if self.extedit or self.addremove then -%>
 					<td class="cbi-section-table-cell">
 						<%- if self.extedit then -%>
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index 78cb9542a3..a1eaeaa8b9 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -337,7 +337,8 @@ table.smalltext tr td {
 
 div.cbi-value {
 	clear: left;
-	padding: 0.25em;
+	vertical-align: middle;
+	padding-left: 0.25em;
 	border-bottom: 1px dotted #bbbbbb;
 }