diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index e90363344..e9e32e97d 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -144,13 +144,13 @@ $(document).ready( function() {
 
 	function showKeywordForm($category, $user) { /* {{{ */
 		if(!$category) {
-			$this->contentContainerStart();
 ?>
 			
 			<form class="form-horizontal" action="../op/op.DefaultKeywords.php" method="post" id="form">
   		<?php echo createHiddenFieldWithKey('addcategory'); ?>
 			<input type="hidden" name="action" value="addcategory">
 <?php
+			$this->contentContainerStart();
 			$this->formField(
 				getMLText("name"),
 				array(
@@ -160,11 +160,11 @@ $(document).ready( function() {
 					'value'=>''
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category'));
 ?>
 			</form>
 <?php
-			$this->contentContainerEnd();
 		} else {
 			$owner = $category->getOwner();
 			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
@@ -172,6 +172,7 @@ $(document).ready( function() {
 				<form class="form-horizontal form" action="../op/op.DefaultKeywords.php" method="post">
 					<?php echo createHiddenFieldWithKey('editcategory'); ?>
 					<input type="hidden" name="action" value="editcategory">
+					<input type="hidden" name="categoryid" value="<?= $category->getId() ?>">
 <?php
 				$this->contentContainerStart();
 				$this->formField(
@@ -224,7 +225,7 @@ $(document).ready( function() {
   				  <?php echo createHiddenFieldWithKey('newkeywords'); ?>
 						<input type="Hidden" name="action" value="newkeywords">
 						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="text" class="keywords form-control" name="keywords">
+						<input type="text" class="keywords form-control" name="keywords">&nbsp;
 							<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("new_default_keywords");?></button>
 						</form>
 					</div>
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 4cc97966a..bb29e77df 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -194,11 +194,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 				$extmgr->checkExtension($extname);
 				$errmsgs = $extmgr->getErrorMsgs();
 				if($errmsgs)
-					echo "<tr class=\"error\" ref=\"".$extname."\">";
+					echo "<tr class=\"table-danger error\" ref=\"".$extname."\">";
 				else
-					echo "<tr class=\"success\" ref=\"".$extname."\">";
+					echo "<tr class=\"table-success success\" ref=\"".$extname."\">";
 			} else {
-				echo "<tr class=\"warning\" ref=\"".$extname."\">";
+				echo "<tr class=\"table-warning warning\" ref=\"".$extname."\">";
 			}
 			echo "<td width=\"32\">";
 			if($extconf['icon'])
@@ -310,9 +310,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 			echo "<tr";
 			if(isset($extconf[$re['name']])) {
 				if($needsupdate)
-					echo " class=\"warning\"";
+					echo " class=\"table-warning warning\"";
 				else
-					echo " class=\"success\"";
+					echo " class=\"table-success success\"";
 			}
 			echo ">";
 			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index afc4e3687..023703584 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -564,7 +564,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$content .= "      <div class=\"dropdown-divider\"></div>\n";
 				} else {
 					$content .= "    <li class=\"nav-item\">\n";
-					$content .= "<a class=\"nav-link".(isset($menuitem['class']) ? " ".$menuitem['class'] : "")."\" href=\"".$menuitem['link']."\"".(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '');
+					$content .= "<a class=\"nav-link".(isset($menuitem['class']) ? " ".$menuitem['class'] : "")."\"".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '');
 					if(!empty($menuitem['attributes']))
 						foreach($menuitem['attributes'] as $attr)
 							$content .= ' '.$attr[0].'="'.$attr[1].'"';