diff --git a/views/bootstrap/class.FolderAttributeGroup.php b/views/bootstrap/class.FolderAttributeGroup.php
index cb9487f46..d4f8b8502 100644
--- a/views/bootstrap/class.FolderAttributeGroup.php
+++ b/views/bootstrap/class.FolderAttributeGroup.php
@@ -79,7 +79,6 @@ $(document).ready(function() {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 
 		$this->contentHeading(getMLText("edit_existing_attribute_groups"));
-		$this->contentContainerStart();
 
 		$attrgrpIDs = array();
 
@@ -101,7 +100,7 @@ $(document).ready(function() {
 						print "<input type=\"Hidden\" name=\"action\" value=\"delattributegroup\">\n";
 						print "<input type=\"Hidden\" name=\"groupid\" value=\"".$attrgrp['group']->getID()."\">\n";
 						print "<td>";
-						print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+						print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
 						print "</td>";
 						print "</form>\n";
 					}else print "<td></td>";
@@ -122,35 +121,31 @@ $(document).ready(function() {
 
 ?>
 <br>
-<form action="../op/op.FolderAttributeGroup.php" method="post" id="form1" name="form1">
+<form action="../op/op.FolderAttributeGroup.php" class="form-horizontal" method="post" id="form1" name="form1">
 <?php	echo createHiddenFieldWithKey('folderattributegroup'); ?>
-<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>">
-<input type="Hidden" name="action" value="addattributegroup">
-<table class="table-condensed">
-	<tr>
-		<td><?php printMLText("group");?>:</td>
-		<td>
-			<select name="groupid">
-				<option value="-1"><?php printMLText("select_one");?>
-				<?php
-					foreach ($allGroups as $groupObj) {
-						if ($user->isAdmin() && !in_array($groupObj->getID(), $attrgrpIDs)) {
-							print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "\n";
-						}
-					}
-				?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td></td>
-		<td><input type="submit" class="btn" value="<?php printMLText("add") ?>"></td>
-	</tr>
-</table>
+<input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
+<input type="hidden" name="action" value="addattributegroup">
+<?php
+		$this->contentContainerStart();
+		$options = array();
+		$options[] = array(0, getMLText('select_one'));
+		foreach($allGroups as $groupObj) {
+			$options[] = array($groupObj->getID(), htmlspecialchars($groupObj->getName()), $user->isAdmin() && in_array($groupObj->getID(), $attrgrpIDs));
+		}
+		$this->formField(
+			getMLText("group"),
+			array(
+				'element'=>'select',
+				'name'=>'groupid',
+				'options'=>$options
+			)
+		);
+		$this->contentContainerEnd();
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("add"));
+?>
 </form>
 
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */