diff --git a/module/admin-core/src/view/admin_system/ipkg.htm b/module/admin-core/src/view/admin_system/ipkg.htm
index a385e8327e..9a88ee57b5 100644
--- a/module/admin-core/src/view/admin_system/ipkg.htm
+++ b/module/admin-core/src/view/admin_system/ipkg.htm
@@ -10,14 +10,17 @@
 <br />
 
 <form method="post" action="<%=controller%>/admin/system/ipkg">
-	<div class="cbi-section-node">
-		<div><textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea></div>
-		<br />
-		<div>
-			<input type="submit" value="<%:save Speichern%>" />
-			<input type="reset" value="<%:reset Zurücksetzen%>" />
+	<div class="cbi-section-node" style="width: 100%">
+		<div class="cbi-value">
+			<div class="cbi-value-field">
+				<textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea>
+			</div>
 		</div>
-		<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
 	</div>
+	<div>
+		<input type="submit" value="<%:save Speichern%>" />
+		<input type="reset" value="<%:reset Zurücksetzen%>" />
+	</div>
+	<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
 </form>
 <%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/passwd.htm b/module/admin-core/src/view/admin_system/passwd.htm
index 10a079945e..87b2533687 100644
--- a/module/admin-core/src/view/admin_system/passwd.htm
+++ b/module/admin-core/src/view/admin_system/passwd.htm
@@ -15,12 +15,12 @@
 <% if not stat or stat == 10 then %>
 	<form method="post" action="<%=controller%>/admin/system/passwd">
 		<div class="cbi-section-node">
-			<div class="cbi-value clear">
-				<div class="cbi-value-title left"><%:password Passwort%></div>
+			<div class="cbi-value">
+				<div class="cbi-value-title"><%:password Passwort%></div>
 				<div class="cbi-value-field"><input type="password" name="pwd1" /></div>
 			</div>
-			<div class="cbi-value clear">
-				<div class="cbi-value-title left"><%:confirmation Bestätigung%></div>
+			<div class="cbi-value">
+				<div class="cbi-value-title"><%:confirmation Bestätigung%></div>
 				<div class="cbi-value-field"><input type="password" name="pwd2" /></div>
 			</div>
 			<br />
diff --git a/module/admin-core/src/view/admin_system/sshkeys.htm b/module/admin-core/src/view/admin_system/sshkeys.htm
index ad80b63f0e..3765e1eeac 100644
--- a/module/admin-core/src/view/admin_system/sshkeys.htm
+++ b/module/admin-core/src/view/admin_system/sshkeys.htm
@@ -10,14 +10,17 @@
 <br />
 
 <form method="post" action="<%=controller%>/admin/system/sshkeys">
-	<div class="cbi-section-node">
-		<div><textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea></div>
-		<br />
-		<div>
-			<input type="submit" value="<%:save Speichern%>" />
-			<input type="reset" value="<%:reset Zurücksetzen%>" />
+	<div class="cbi-section-node" style="width: 100%">
+		<div class="cbi-value">
+			<div class="cbi-value-field">
+				<textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea>
+			</div>
 		</div>
-		<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
 	</div>
+	<div>
+		<input type="submit" value="<%:save Speichern%>" />
+		<input type="reset" value="<%:reset Zurücksetzen%>" />
+	</div>
+	<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
 </form>
 <%+footer%>
\ No newline at end of file