diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index bcdf873bc..4305371cd 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -187,6 +187,7 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addgroup">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -207,14 +208,15 @@ $(document).ready( function() {
 				'value'=>($group ? htmlspecialchars($group->getComment()) : '')
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
 		if($group) {
-			$this->contentSubHeading(getMLText("group_members"));
+			$this->contentHeading(getMLText("group_members"));
 ?>
-		<table class="table-condensed">
+		<table class="table table-condensed table-sm">
 <?php
 			$members = $group->getUsers();
 			if (count($members) == 0)
@@ -228,9 +230,9 @@ $(document).ready( function() {
 					print "<td>" . htmlspecialchars($member->getFullName()) . "</td>";
 					print "<td>" . ($group->isMember($member,true)?getMLText("manager"):"&nbsp;") . "</td>";
 					print "<td>";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" 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.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i><span class=\"d-none d-lg-block\"> ".getMLText("delete")."</span></button></form>";
 					print "&nbsp;";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-random\"></i> ".getMLText("toggle_manager")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-secondary btn-mini btn-sm\"><i class=\"fa fa-random\"></i><span class=\"d-none d-lg-block\"> ".getMLText("toggle_manager")."</span></button></form>";
 					print "</td></tr>";
 				}
 			}
@@ -238,7 +240,7 @@ $(document).ready( function() {
 		</table>
 		
 <?php
-			$this->contentSubHeading(getMLText("add_member"));
+			$this->contentHeading(getMLText("add_member"));
 ?>
 		
 		<form class="form-horizontal" action="../op/op.GroupMgr.php" method="POST" name="form_2" id="form_2">
@@ -246,6 +248,7 @@ $(document).ready( function() {
 		<input type="Hidden" name="action" value="addmember">
 		<input type="Hidden" name="groupid" value="<?php print $group->getID();?>">
 <?php
+		$this->contentContainerStart();
 		$options = array();
 		$allUsers = $dms->getAllUsers($sortusersinlist);
 		foreach ($allUsers as $currUser) {
@@ -271,6 +274,7 @@ $(document).ready( function() {
 				'value'=>1
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add'));
 ?>
 		</form>
@@ -329,13 +333,11 @@ $(document).ready( function() {
 		 }
 		$this->columnEnd();
 		$this->columnStart(8);
-		$this->contentContainerStart();
 		if($accessop->check_view_access($this, array('action'=>'form'))) {
 ?>
 		<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 <?php
 		}
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->rowEnd();
 		$this->contentEnd();
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index dd89641c3..a0d5474a3 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -252,6 +252,7 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="adduser">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("user_login"),
 			array(
@@ -269,7 +270,7 @@ $(document).ready( function() {
 		if($passwordstrength > 0) {
 			$this->formField(
 				getMLText("password_strength"),
-				'<div id="strengthbar'.($currUser ? $currUser->getID() : "0").'" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
+				'<div id="strengthbar'.($currUser ? $currUser->getID() : "0").'" class="progress" style="_width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger bg-danger" style="width: 0%;"></div></div>'
 			);
 		}
 		$this->formField(
@@ -551,6 +552,7 @@ $(document).ready( function() {
 				);
 			}
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($currUser ? "save" : "add_user"));
 ?>
 	</form>
@@ -610,14 +612,12 @@ $(document).ready( function() {
 		}
 		$this->columnEnd();
 		$this->columnStart(8);
-		$this->contentContainerStart();
 ?>
 <?php if($accessobject->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 	</div>
 	<?php
-		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->rowEnd();
 		$this->contentEnd();
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index c0f856148..57ccecf7f 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1041,9 +1041,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function contentHeading($heading, $noescape=false) { /* {{{ */
 
 		if($noescape)
-			echo "<legend>".$heading."</legend>\n";
+			echo "<legend class=\"border-bottom\">".$heading."</legend>\n";
 		else
-			echo "<legend>".htmlspecialchars($heading)."</legend>\n";
+			echo "<legend class=\"border-bottom\">".htmlspecialchars($heading)."</legend>\n";
 		return;
 	} /* }}} */
 
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index a94495658..4f129e2a3 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -521,11 +521,11 @@ $(document).ready( function() {
 					pwsp = 100*data.score;
 					$('#'+target+' div.bar').width(pwsp+'%');
 					if(data.ok) {
-						$('#'+target+' div.bar').removeClass('bar-danger');
-						$('#'+target+' div.bar').addClass('bar-success');
+						$('#'+target+' div.bar').removeClass('bg-danger');
+						$('#'+target+' div.bar').addClass('bg-success');
 					} else {
-						$('#'+target+' div.bar').removeClass('bar-success');
-						$('#'+target+' div.bar').addClass('bar-danger');
+						$('#'+target+' div.bar').removeClass('bg-success');
+						$('#'+target+' div.bar').addClass('bg-danger');
 					}
 				}
 			}); /* }}} */
@@ -588,11 +588,11 @@ $(document).ready( function() {
 					pwsp = 100*data.score;
 					$('#'+target+' div.bar').width(pwsp+'%');
 					if(data.ok) {
-						$('#'+target+' div.bar').removeClass('bar-danger');
-						$('#'+target+' div.bar').addClass('bar-success');
+						$('#'+target+' div.bar').removeClass('bg-danger');
+						$('#'+target+' div.bar').addClass('bg-success');
 					} else {
-						$('#'+target+' div.bar').removeClass('bar-success');
-						$('#'+target+' div.bar').addClass('bar-danger');
+						$('#'+target+' div.bar').removeClass('bg-success');
+						$('#'+target+' div.bar').addClass('bg-danger');
 					}
 				}
 			}); /* }}} */
@@ -804,7 +804,7 @@ function onAddClipboard(ev) { /* {{{ */
 		this.statusbar = $("<div class='statusbar "+row+"'></div>");
 		this.filename = $("<div class='filename'></div>").appendTo(this.statusbar);
 		this.size = $("<div class='filesize'></div>").appendTo(this.statusbar);
-		this.progressBar = $("<div class='progress'><div class='bar bar-success'></div></div>").appendTo(this.statusbar);
+		this.progressBar = $("<div class='progress'><div class='bar bg-success'></div></div>").appendTo(this.statusbar);
 		this.abort = $("<div class='btn btn-mini btn-danger'>" + abortBtnLabel + "</div>").appendTo(this.statusbar);
 //		$('.statusbar').empty();
 		obj.after(this.statusbar);