diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/ControlGroup.html b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/FormGroup.html
similarity index 54%
rename from bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/ControlGroup.html
rename to bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/FormGroup.html
index 5bb6dc4f5..14d7b342a 100644
--- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/ControlGroup.html
+++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/form/FormGroup.html
@@ -6,12 +6,10 @@
         <wicket:border>
             <label wicket:id="label" class="control-label">Text input</label>
 
-            <div class="controls">
-                <wicket:body/>
+            <wicket:body/>
 
-                <p wicket:id="error" class="help-block"></p>
-                <p wicket:id="help" class="help-block">Supporting help text</p>
-            </div>
+            <p wicket:id="error" class="help-block"></p>
+            <p wicket:id="help" class="help-block">Supporting help text</p>
         </wicket:border>
     </body>
 </html>