diff --git a/views/bootstrap/class.AttributeGroupMgr.php b/views/bootstrap/class.AttributeGroupMgr.php
index 28544c219..27947f33b 100644
--- a/views/bootstrap/class.AttributeGroupMgr.php
+++ b/views/bootstrap/class.AttributeGroupMgr.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AttributeGroupMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AttributeGroupMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selgroup = $this->params['selattrdefgroup'];
@@ -146,7 +146,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removegroup'); ?>
 				<input type="hidden" name="attrdefgroupid" value="<?php echo $selgroup->getID()?>">
 				<input type="hidden" name="action" value="removegroup">
-				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdefgroup")?></button>
+				<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdefgroup")?></button>
 			</form>
 <?php
 		}
@@ -195,7 +195,7 @@ $(document).ready( function() {
 	</form>
 <?php
 		if($group) {
-			$this->contentSubHeading(getMLText("group_members"));
+			$this->contentHeading(getMLText("group_members"));
 ?>
 		<table class="table-condensed">
 <?php
@@ -265,16 +265,16 @@ $(document).ready( function() {
 					echo "</select> ";
 					print "</td>";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn\"><i class=\"fa fa-save\"></i></button></form>";
+					print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i></button></form>";
 					print "</td>";
 					print "<td>";
 					if($i != 0)
-						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newupseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-arrow-up\"></i></button></form>";
+						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newupseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-secondary btn-mini btn-sm\"><i class=\"fa fa-arrow-up\"></i></button></form>";
 					print "</td><td>";
 					if($i < count($members)-1)
-						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newdownseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-arrow-down\"></i></button></form>";
+						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newdownseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-secondary btn-mini btn-sm\"><i class=\"fa fa-arrow-down\"></i></button></form>";
 					print "</td><td>";
-					print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 					print "</td></tr>";
 					$i++;
 				}
@@ -283,7 +283,7 @@ $(document).ready( function() {
 		</table>
 		
 <?php
-			$this->contentSubHeading(getMLText("add_member"));
+			$this->contentHeading(getMLText("add_member"));
 ?>
 		
 		<form class="form-inline" action="../op/op.AttributeGroupMgr.php" method="POST" name="form_2" id="form_2">
@@ -293,7 +293,7 @@ $(document).ready( function() {
 		<table class="table-condensed">
 			<tr>
 				<td>
-					<select name="attrdefid" id="attrdefid">
+					<select class="chzn-select" name="attrdefid" id="attrdefid">
 						<option value="-1"><?php printMLText("select_one");?>
 						<?php
 							foreach ($allUsers as $currUser)
@@ -311,7 +311,7 @@ $(document).ready( function() {
 					</select>
 				</td>
 				<td>
-					<input type="submit" class="btn" value="<?php printMLText("add");?>">
+					<input type="submit" class="btn btn-primary" value="<?php printMLText("add");?>">
 				</td>
 			</tr>
 		</table>
@@ -340,10 +340,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("attrdefgroup_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-
-<div class="row-fluid">
-<div class="span4">
 <form class="form-horizontal">
 	<select class="chzn-select" id="selector">
 		<option value="-1"><?php echo getMLText("choose_attrdefgroup")?>
@@ -359,19 +358,18 @@ $(document).ready( function() {
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="AttributeGroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"attrdefgroupid=".$selgroup->getID()."\"" : "") ?>></div>
 <?php } ?>
-</div>
-
-<div class="span8">
+<?php
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
 	<div class="well">
 <?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="AttributeGroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"attrdefgroupid=".$selgroup->getID()."\"" : "") ?>></div>
 <?php } ?>
 	</div>
-</div>
-
-</div>
-
 <?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index db7eee1b5..49c50575a 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -236,6 +236,7 @@ $(document).ready( function() {
 	<input type="hidden" name="userid" id="userid" value="<?php print $seluser->getID();?>">
 	<input type="hidden" name="action" value="addapikey">
 <?php
+			$this->contentContainerStart();
 			$this->formField(
 				getMLText("apikey"),
 				array(
@@ -246,7 +247,8 @@ $(document).ready( function() {
 					'value'=>md5(uniqid(time())),
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText($seluser ? "save" : "add_apikey"));
+			$this->contentContainerEnd();
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($seluser ? "save" : "add_apikey"));
 		} 
 	} /* }}} */
 
@@ -258,7 +260,7 @@ $(document).ready( function() {
 		$apikeys = SeedDMS_Core_ApiKey::getAllInstances('expires', $dms);
 		if($apikeys) {
 			echo $this->contentHeading(getMLText('apikeys'));
-			echo "<table class=\"table table-condensed\">\n";
+			echo "<table class=\"table table-condensed table-sm\">\n";
 			echo "<thead><tr>";
 			echo "<th>".getMLText('apikey')."</th>";
 			echo "</tr></thead><tbody>";
@@ -669,13 +671,12 @@ $(document).ready( function() {
 		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 ?>
 <?php if($accessobject->check_view_access($this, array('action'=>'formapikeys'))) { ?>
 		<div class="ajax" data-view="UsrMgr" data-action="formapikeys" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 <?php if($accessobject->check_view_access($this, array('action'=>'listapikeys'))) { ?>
-		<div class="ajax" data-view="UsrMgr" data-action="listapikeys" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
+		<div class="ajax mt-4" data-view="UsrMgr" data-action="listapikeys" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 	<?php
 		$this->columnEnd();