diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 099bcadcd..8eef31464 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -41,15 +41,13 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("clear_cache"));
-		$this->contentContainerStart('warning');
-
+		$this->warningMsg(getMLText("confirm_clear_cache", array('cache_dir'=>$cachedir)));
 ?>
 <form action="../op/op.ClearCache.php" name="form1" method="post">
 <?php echo createHiddenFieldWithKey('clearcache'); ?>
-<p>
-<?php printMLText("confirm_clear_cache", array('cache_dir'=>$cachedir));?>
-</p>
-<p>
+<?php
+		$this->contentContainerStart('warning');
+?>
 <input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images'); ?>
 </p>
 <p>
@@ -60,11 +58,11 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 			foreach($addcache as $c)
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}
+		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('clear_cache'), '', '', 'danger');
 ?>
-<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 7ef06f0ab..fe1bf72ee 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -52,8 +52,8 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
 
 		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
 			$this->warningMsg(getMLText("import_fs_warning"));
-			$this->contentContainerStart();
 			print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
+			$this->contentContainerStart();
 			$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE));
 			$this->formField(
 				getMLText("dropfolder_folder"),
@@ -90,9 +90,9 @@ class SeedDMS_View_ImportFS extends SeedDMS_Theme_Style {
 					'value'=>'1'
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 			print "</form>\n";
-			$this->contentContainerEnd();
 		} else {
 			$this->warningMsg(getMLText("dropfolderdir_missing"));
 		}
diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index 8afed5a54..69ea90d73 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -53,8 +53,8 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
 
 		$this->rowStart();
 		$this->columnStart(4);
-		$this->contentContainerStart();
 		print "<form class=\"form-horizontal\" action=\"../op/op.ImportUsers.php\" name=\"form1\" enctype=\"multipart/form-data\" method=\"post\">";
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("userdata_file"),
 			$this->getFileChooserHtml('userdata', false)
@@ -77,9 +77,9 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
 				'value'=>'1'
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 		print "</form>\n";
-		$this->contentContainerEnd();
 
 		$this->columnEnd();
 		$this->columnStart(8);