diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/cbi/luasrc/view/cbi/dynlist.htm
index 1cfd6f03e5..d2e60b1de8 100644
--- a/libs/cbi/luasrc/view/cbi/dynlist.htm
+++ b/libs/cbi/luasrc/view/cbi/dynlist.htm
@@ -39,7 +39,6 @@ $Id$
 			<%- end -%>', '<%:cbi_manual%>');
 		</script>
 	<% end -%>
-	<br />
 <% if i <= #vals then %><br />
 <% end end %>
 <%+cbi/valuefooter%>
diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index be7e723f7a..b0da0813d3 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -106,24 +106,20 @@ end
 			</div>
 		<% end %>
 
-			<%- if self.addremove then -%>
-			<div class="cbi-section-table-row">
-				<td colspan="<%=count%>" class="cbi-section-table-optionals">
-					<div class="cbi-section-create">
-						<% if self.anonymous then %>
-							<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
-						<% else %>
-							<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
-							<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-							<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
-							<% if self.invalid_cts then -%>
-								<br /><%:cbi_invalid%></div>
-							<%- end %>
-						<% end %>
-					</div>
-				</td>
-			</div>
-			<%- end -%>
+		<%- if self.addremove then -%>
+		<div class="cbi-section-create">
+			<% if self.anonymous then %>
+				<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
+			<% else %>
+				<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+				<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
+				<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
+				<% if self.invalid_cts then -%>
+					<br /><%:cbi_invalid%></div>
+				<%- end %>
+			<% end %>
+		</div>
+		<%- end -%>
 	</div>
 </fieldset>
 <!-- /tblsection -->