diff --git a/inc/inc.ClassUI_Default.php b/inc/inc.ClassUI_Default.php
index 2a8bb5f18..581655425 100644
--- a/inc/inc.ClassUI_Default.php
+++ b/inc/inc.ClassUI_Default.php
@@ -79,7 +79,7 @@ class UI_Default {
 
 	function footNote() { /* {{{ */
 		global $settings;
-		
+
 		echo "<div class=\"container-fluid\" style=\"margin-top: 0px;\">\n";
 		echo '<div class="row-fluid">'."\n";
 		echo '<div class="span12">'."\n";
@@ -95,7 +95,7 @@ class UI_Default {
 		echo "</div>\n";
 		echo "</div>\n";
 		echo "</div>\n";
-	
+
 		return;
 	} /* }}} */
 
@@ -124,7 +124,7 @@ class UI_Default {
 	} /* }}} */
 
 	function __globalNavigation($folder=null) { /* {{{ */
-	
+
 		global $settings, $user;
 
 		echo "<div class=\"globalBox\">\n";
@@ -203,7 +203,7 @@ class UI_Default {
 	} /* }}} */
 
 	function __folderNavigationBar($folder) { /* {{{ */
-	
+
 		global $user, $settings, $theme;
 
 		if (!is_object($folder) || strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) {
@@ -237,7 +237,7 @@ class UI_Default {
 	} /* }}} */
 
 	function __documentNavigationBar()	{ /* {{{ */
-	
+
 		global $user, $settings, $document;
 
 		$accessMode = $document->getAccessMode($user);
@@ -274,13 +274,13 @@ class UI_Default {
 	} /* }}} */
 
 	function __accountNavigationBar() { /* {{{ */
-	
+
 		global $settings,$user;
-		
+
 		echo "<ul class=\"localNav\">\n";
 		if (!$settings->_disableSelfEdit) echo "<li id=\"first\"><a href=\"../out/out.EditUserData.php\">".getMLText("edit_user_details")."</a></li>\n";
-		
-		if (!$user->isAdmin()) 
+
+		if (!$user->isAdmin())
 			echo "<li><a href=\"../out/out.UserDefaultKeywords.php\">".getMLText("edit_default_keywords")."</a></li>\n";
 
 		echo "<li><a href=\"../out/out.ManageNotify.php\">".getMLText("edit_existing_notify")."</a></li>\n";
@@ -288,7 +288,7 @@ class UI_Default {
 		if ($settings->_enableUsersView){
 			echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
 			echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
-		}		
+		}
 		echo "</ul>\n";
 		return;
 	} /* }}} */
@@ -305,7 +305,7 @@ class UI_Default {
 	} /* }}} */
 
 	function __adminToolsNavigationBar() { /* {{{ */
-	
+
 		global $settings;
 
 		echo "<ul class=\"localNav\">\n";
@@ -318,13 +318,13 @@ class UI_Default {
 		echo "</ul>\n";
 		return;
 	} /* }}} */
-	
+
 	function __calendarNavigationBar($d){ /* {{{ */
 
 		global $settings,$user;
 
 		$ds="&day=".$d[0]."&month=".$d[1]."&year=".$d[2];
-	
+
 		echo "<ul class=\"localNav\">\n";
 		echo "<li><a href=\"../out/out.Calendar.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.Calendar.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
@@ -332,7 +332,7 @@ class UI_Default {
 		if (!$user->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		return;
-	
+
 	} /* }}} */
 
 	function __pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
@@ -359,7 +359,7 @@ class UI_Default {
 				}
 			}
 			else {
-					$resultsURI .= ($first ? "?" : "&").$key."=".$value;
+				$resultsURI .= ($first ? "?" : "&").$key."=".$value;
 			}
 			$first = false;
 		}
@@ -496,7 +496,7 @@ class UI_Default {
 	} /* }}} */
 
 	function __printDateChooser($defDate = -1, $varName) { /* {{{ */
-	
+
 		if ($defDate == -1)
 			$defDate = mktime();
 		$day   = date("d", $defDate);
@@ -521,7 +521,7 @@ class UI_Default {
 			print ">" . $i . "</option>\n";
 		}
 		print "</select> \n";
-		print "<select name=\"" . $varName . "year\">\n";	
+		print "<select name=\"" . $varName . "year\">\n";
 		for ($i = $year-5 ; $i <= $year+5 ; $i++)
 		{
 			print "<option value=\"" . $i . "\"";
@@ -557,7 +557,7 @@ class UI_Default {
 		}
 		print "</select>";
 	} /* }}} */
-	
+
 	function __printDocumentChooser($formName) { /* {{{ */
 		global $settings;
 		?>
@@ -657,46 +657,46 @@ class UI_Default {
 	} /* }}} */
 
 	static function exitError($pagetitle,$error) { /* {{{ */
-	
+
 		UI::htmlStartPage($pagetitle);
 		UI::globalNavigation();
 
 		print "<div class=\"error\">";
 		print htmlspecialchars($error);
 		print "</div>";
-		
+
 		UI::htmlEndPage();
-		
+
 		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle);
-		
-		exit;	
+
+		exit;
 	} /* }}} */
 
 	// navigation flag is used for items links (navigation or selection)
 	function __printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) {	/* {{{ */
 		global $dms, $user, $form, $settings;
-		
+
 		if ($settings->_expandFolderTree==2){
-		
+
 			// folder completely open
 			$is_open=true;
-			
+
 		}else if ($settings->_expandFolderTree==1 && $folderID==$settings->_rootFolderID ){
-		
+
 			$is_open=true;
-			
+
 		}else{
 			// open the tree until the current folder
 			$is_open=false;
-			
+
 			if ($currentFolderID!=-1){
-				
+
 				$currentFolder=$dms->getFolder($currentFolderID);
-				
+
 				if (is_object($currentFolder)){
-				
+
 					$parent=$currentFolder->getParent();
-					
+
 					while (is_object($parent)){
 						if ($parent->getID()==$folderID){
 							$is_open=true;
@@ -707,25 +707,25 @@ class UI_Default {
 				}
 			}
 		}
-		
+
 		$folder = $dms->getFolder($folderID);
 		if (!is_object($folder)) return;
-		
+
 		$subFolders = $folder->getSubFolders();
 		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		
+
 		if ($folderID == $settings->_rootFolderID) print "<ul style='list-style-type: none;' class='tree'>\n";
 
 		print "<li>\n";
 
 		if (count($subFolders) > 0){
-			print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";	
+			print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";
 			if ($is_open) UI::printImgPath("minus.png");
 			else UI::printImgPath("plus.png");
 			print "\" border=0></a>\n";
 		}
 		else{
-			print "<img class='treeicon' src=\"";	
+			print "<img class='treeicon' src=\"";
 			UI::printImgPath("blank.png");
 			print "\" border=0>\n";
 		}
@@ -733,12 +733,12 @@ class UI_Default {
 		if ($folder->getAccessMode($user) >= $accessMode) {
 
 			if ($folderID != $currentFolderID){
-			
+
 				if ($navigation) print "<a href=\"../out/out.ViewFolder.php?folderid=" . $folderID . "&showtree=1\">";
 				else print "<a class=\"foldertree_selectable\" href=\"javascript:folderSelected(" . $folderID . ", '" . str_replace("'", "\\'", htmlspecialchars($folder->getName())) . "')\">";
 
 			}else print "<span class=\"selectedfoldertree\">";
-			
+
 			if ($is_open) print "<img src=\"".UI::getImgPath("folder_opened.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
 			else print "<img src=\"".UI::getImgPath("folder_closed.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
 
@@ -750,22 +750,22 @@ class UI_Default {
 
 		if ($is_open) print "<ul style='list-style-type: none;' id=\"tree".$folderID."\" >\n";
 		else print "<ul style='list-style-type: none; display: none;' id=\"tree".$folderID."\" >\n";
-		
+
 		for ($i = 0; $i < count($subFolders); $i++) {
-		
+
 			if ($subFolders[$i]->getID() == $exclude) continue;
-			
+
 			UI::printFoldersTree( $accessMode, $exclude, $subFolders[$i]->getID(),$currentFolderID,$navigation);
 		}
 
 		print "</ul>\n";
-		
+
 		if ($folderID == $settings->_rootFolderID) print "</ul>\n";
 	} /* }}} */
 
 	function __printTreeNavigation($folderid,$showtree){ /* {{{ */
 		global $settings;
-		
+
 ?>
 		<script language="JavaScript">
 		function toggleTree(id){
@@ -798,9 +798,9 @@ class UI_Default {
 			UI::contentContainerEnd();
 
 		}else{
-		
-			print "<td id='tree-closed'>";		
-		
+
+			print "<td id='tree-closed'>";
+
 			UI::contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><img src=\"".UI::getImgPath("p.png")."\" border=0></a>", true);
 			UI::contentContainerStart();
 			UI::contentContainerEnd();
diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php
index a5782f525..d42c87243 100644
--- a/out/out.ChangePassword.php
+++ b/out/out.ChangePassword.php
@@ -33,7 +33,7 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
 	$hash = $_REQUEST["hash"];
 } else {
 	header("Location: ../out/out.Login.php");
-  exit;
+	exit;
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index fc16beec3..3a2fb2597 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -58,6 +58,7 @@ if (!is_object($version)) {
 $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()==$version->getVersion()) {
 	header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
+	exit;
 }
 
 $folder = $document->getFolder();
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index d0a085fe3..45dffe8e6 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -58,6 +58,7 @@ if ($document->getAccessMode($user) < M_READ) {
  */
 if ($document->verifyLastestContentExpriry()){
 	header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
+	exit;
 }
 
 if($view) {
diff --git a/views/bootstrap/class.AddEvent.php b/views/bootstrap/class.AddEvent.php
index 7b9a78cfe..5b0558020 100644
--- a/views/bootstrap/class.AddEvent.php
+++ b/views/bootstrap/class.AddEvent.php
@@ -82,38 +82,44 @@ $(document).ready(function() {
 		$expdate = date('Y-m-d');
 ?>
 
-<form action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("from");?>:</td>
-			<td><?php //$this->printDateChooser(-1, "from");?>
+<form class="form-horizontal" action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
+
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("from");?>:</label>
+			<div class="controls"><?php //$this->printDateChooser(-1, "from");?>
     		<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
       		<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("to");?>:</td>
-			<td><?php //$this->printDateChooser(-1, "to");?>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("to");?>:</label>
+			<div class="controls"><?php //$this->printDateChooser(-1, "to");?>
     		<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
       		<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
       		<span class="add-on"><i class="icon-calendar"></i></span>
     		</span>
-			</td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input type="text" name="name" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
-		</tr>
-		<tr>
-			<td></td><td><input class="btn" type="submit" value="<?php printMLText("add_event");?>"></td>
-		</tr>
-	</table>
+			</div>
+		</div>
+
+
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("name");?>:</label>
+			<div class="controls"><input type="text" name="name" size="60"></div>
+		</div>
+
+
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls"><textarea name="comment" rows="4" cols="80"></textarea></div>
+		</div>
+		
+		<div class="controls">
+			<input class="btn" type="submit" value="<?php printMLText("add_event");?>">
+		</div>
+
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 23adba842..47f68baa4 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -71,8 +71,8 @@ $(document).ready( function() {
 ?>
 						<form style="display: inline-block;" method="post" action="../op/op.Categories.php" >
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="Hidden" name="action" value="removecategory">
+						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+						<input type="hidden" name="action" value="removecategory">
 						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
diff --git a/views/bootstrap/class.ChangePassword.php b/views/bootstrap/class.ChangePassword.php
index cd094eee0..b3d5b6922 100644
--- a/views/bootstrap/class.ChangePassword.php
+++ b/views/bootstrap/class.ChangePassword.php
@@ -50,7 +50,7 @@ document.form1.newpassword.focus();
 		$this->pageNavigation(getMLText("change_password"));
 		$this->contentContainerStart();
 ?>
-<form action="../op/op.ChangePassword.php" method="post" name="form1">
+<form class="form-horizontal" action="../op/op.ChangePassword.php" method="post" name="form1">
 <?php
 		if ($referuri) {
 			echo "<input type='hidden' name='referuri' value='".$referuri."'/>";
@@ -59,32 +59,32 @@ document.form1.newpassword.focus();
 			echo "<input type='hidden' name='hash' value='".$hash."'/>";
 		}
 ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("password");?>:</td>
-			<td><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></td>
-		</tr>
+
+		 <div class="control-group">
+			<label class="control-label"><?php printMLText("password");?>:</label>
+			<div class="controls"><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></div>
+		 </div>
 <?php
 		if($passwordstrength > 0) {
 ?>
-		<tr>
-			<td><?php printMLText("password_strength");?>:</td>
-			<td>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("password_strength");?>:</label>
+			<div class="controls">
 				<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
-			</td>
-		</tr>
+			</div>
+		</div>
 <?php
 		}
 ?>
-		<tr>
-			<td><?php printMLText("confirm_pwd");?>:</td>
-			<td><input type="password" name="newpasswordrepeat" id="passwordrepeat"></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></td>
-		</tr>
-	</table>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
+			<div class="controls"><input type="password" name="newpasswordrepeat" id="passwordrepeat"></div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"></label>
+			<div class="controls"><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></div>
+		</div>
+
 </form>
 <?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index dda782f25..cd222d756 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -140,21 +140,22 @@ $(document).ready( function() {
 			$owner = $category->getOwner();
 			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
 ?>
-			<table class="table-condensed">
-				<tr>
-					<td></td>
-					<td>
+
+				<div class="control-group">
+					<label class="control-label"></label>
+					<div class="controls">
 						<form action="../op/op.DefaultKeywords.php" method="post">
   						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 							<input type="Hidden" name="action" value="removecategory">
 							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
 						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
+					</div>
+				</div>
+
+				<div class="control-group">
+					<label class="control-label"><?php echo getMLText("name")?>:</label>
+					<div class="controls">
 						<form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post">
   						<?php echo createHiddenFieldWithKey('editcategory'); ?>
 							<input type="hidden" name="action" value="editcategory">
@@ -162,11 +163,12 @@ $(document).ready( function() {
 							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
 							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
 						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("default_keywords")?>:</td>
-					<td>
+					</div>
+				</div>
+
+				<div class="control-group">
+					<label class="control-label"><?php echo getMLText("default_keywords")?>:</label>
+					<div class="controls">
 						<?php
 							$lists = $category->getKeywordLists();
 							if (count($lists) == 0)
@@ -192,23 +194,22 @@ $(document).ready( function() {
 									</form>
 									<br>
 						<?php }  ?>
-					</td>
-				</tr>
-				<tr>
-					<td></td>
-					<td>
+					</div>
+				</div>
+				
+				<div class="control-group">
+					<label class="control-label"></label>
+					<div class="controls">
 					  <form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post">
   				  <?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" name="keywords">
-					
-					  <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
+					  	<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
 						</form>
-					</td>
-				</tr>
+					</div>
+				</div>
 
-			</table>
 <?php
 		}
 	} /* }}} */
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index c65dd9d25..a172a92d4 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -115,13 +115,13 @@ $(document).ready( function() {
 ?>
 <br>
 
-<form action="../op/op.DocumentNotify.php" name="form1" id="form1">
+<form class=form-horizontal" action="../op/op.DocumentNotify.php" name="form1" id="form1">
 <input type="hidden" name="documentid" value="<?php print $document->getID()?>">
 <input type="hidden" name="action" value="addnotify">
-<table class="table-condensed">
-	<tr>
-		<td><?php printMLText("user");?>:</td>
-		<td>
+
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("user");?>:</label>
+		<div class="controls">
 			<select name="userid">
 				<option value="-1"><?php printMLText("select_one");?>
 				<?php
@@ -137,11 +137,14 @@ $(document).ready( function() {
 					}
 				?>
 			</select>
-		</td>
-	</tr>
-	<tr>
-		<td><?php printMLText("group");?>:</td>
-		<td>
+		</div>
+	</div>
+
+
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("group");?>:</label>
+
+		<div class="controls">
 			<select name="groupid">
 				<option value="-1"><?php printMLText("select_one");?>
 				<?php
@@ -153,13 +156,13 @@ $(document).ready( function() {
 					}
 				?>
 			</select>
-		</td>
-	</tr>
-	<tr>
-		<td></td>
-		<td><input type="submit" class="btn" value="<?php printMLText("add") ?>"></td>
-	</tr>
-</table>
+		</div>
+	</div>
+
+	<div class="controls">
+		<input type="submit" class="btn" value="<?php printMLText("add") ?>">
+	</div>
+
 </form>
 
 <?php
diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index bcb0ccca5..cc2645f75 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -47,27 +47,28 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("edit_attributes"));
 		$this->contentContainerStart();
 ?>
-<form action="../op/op.EditAttributes.php" name="form1" method="POST">
+<form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
 	<?php echo createHiddenFieldWithKey('editattributes'); ?>
-	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
-	<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
-	<table class="table-condensed">
+	<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
+	<input type="hidden" name="version" value="<?php print $version->getVersion();?>">
+
 <?php
 			if($attrdefs) {
 				foreach($attrdefs as $attrdef) {
 ?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></td>
-</tr>
+    <div class="control-group">
+	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
+        <div class="controls">
+	        <?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?>
+        </div>
+	</div>
 <?php
 				}
 			}
 ?>
-		<tr>
-			<td colspan="2"><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td>
-		</tr>
-	</table>
+		<div class="controls">
+			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+		</div>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php
index fae7bdb72..2c12e3ada 100644
--- a/views/bootstrap/class.EditComment.php
+++ b/views/bootstrap/class.EditComment.php
@@ -84,20 +84,19 @@ $(document).ready(function() {
 		$this->contentHeading(getMLText("edit_comment"));
 		$this->contentContainerStart();
 ?>
-<form action="../op/op.EditComment.php" id="form1" name="form1" method="post">
+<form class="form-horizontal" action="../op/op.EditComment.php" id="form1" name="form1" method="post">
 	<?php echo createHiddenFieldWithKey('editcomment'); ?>
 	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
 	<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
-	<table class="table-condensed">
-		<tr>
-			<td class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td>
-		</tr>
-	</table>
+	<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls">
+				<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea>
+			</div>
+	</div>
+	<div class="controls">
+		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+	</div>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index c6e14f0c5..229526cbc 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -84,43 +84,46 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 ?>
 
-<form action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
+<form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
   <?php echo createHiddenFieldWithKey('editevent'); ?>
 
-	<input type="Hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
+	<input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
 
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("from");?>:</td>
-			<td><?php //$this->printDateChooser($event["start"], "from");?>
-    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
-      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
-      		<span class="add-on"><i class="icon-calendar"></i></span>
-    		</span>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("to");?>:</td>
-			<td><?php //$this->printDateChooser($event["stop"], "to");?>
-    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
-      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
-      		<span class="add-on"><i class="icon-calendar"></i></span>
-    		</span>
-			</td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td>
-		</tr>
-	</table>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("from");?>:</label>
+			<div class="controls">
+				<?php //$this->printDateChooser($event["start"], "from");?>
+	    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
+	      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
+	      		<span class="add-on"><i class="icon-calendar"></i>
+	    		</span>
+	    	</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("to");?>:</label>
+			<div class="controls">
+				<?php //$this->printDateChooser($event["stop"], "to");?>
+	    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
+	      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
+	      		<span class="add-on"><i class="icon-calendar"></i></span>
+	    		</span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("name");?>:</label>
+			<div class="controls">
+				<input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60">
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls">
+				<textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea>
+			</div>
+		</div>
+		<div class="controls">
+			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+		</div>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index 338eaaf01..3161db44f 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -158,8 +158,8 @@ $(document).ready(function() {
 ?>
 <form class="form-inline" action="../op/op.FolderAccess.php">
   <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="Hidden" name="action" value="setdefault">
+	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
+	<input type="hidden" name="action" value="setdefault">
 	<?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?>
 	<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
 </form>
@@ -179,9 +179,9 @@ $(document).ready(function() {
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
+				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<td>\n";
 				$this->printAccessModeSelection($userAccess->getMode());
 				print "</td>\n";
@@ -191,9 +191,9 @@ $(document).ready(function() {
 				print "</form>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
+				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<td>\n";
 				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
@@ -209,9 +209,9 @@ $(document).ready(function() {
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.FolderAccess.php\">";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
+				print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
+				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
+				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
 				print "<td>";
 				$this->printAccessModeSelection($groupAccess->getMode());
 				print "</td>\n";
@@ -221,9 +221,9 @@ $(document).ready(function() {
 				print "</form>";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
+				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
 				print "<td>";
 				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
@@ -236,8 +236,8 @@ $(document).ready(function() {
 ?>
 <form action="../op/op.FolderAccess.php" id="form1" name="form1">
 <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>">
-<input type="Hidden" name="action" value="addaccess">
+<input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
+<input type="hidden" name="action" value="addaccess">
 <table class="table-condensed">
 <tr>
 <td><?php printMLText("user");?>:</td>
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index c68311d93..418ffb42f 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -125,13 +125,13 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"><?php printMLText("user_login");?>:</label>
 		<div class="controls">
-			<input type="text" id="login" name="login" placeholder="login" required>
+			<input type="text" id="login" name="login" placeholder="login" autocomplete="off" required>
 		</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="pwd"><?php printMLText("password");?>:</label>
 		<div class="controls">
-			<input type="Password" id="pwd" name="pwd" required>
+			<input type="Password" id="pwd" name="pwd" autocomplete="off" required>
 		</div>
 	</div>
 <?php if($enableLanguageSelector) { ?>
diff --git a/views/bootstrap/class.MoveFolder.php b/views/bootstrap/class.MoveFolder.php
index a3265f098..4387ac42e 100644
--- a/views/bootstrap/class.MoveFolder.php
+++ b/views/bootstrap/class.MoveFolder.php
@@ -51,20 +51,19 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 
 ?>
-<form action="../op/op.MoveFolder.php" name="form1">
+<form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1">
 	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="hidden" name="showtree" value="<?php echo showtree();?>">
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("choose_target_folder");?>:</td>
-			<td><?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>"></td>
-		</tr>
-	</table>
-	</form>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("choose_target_folder");?>:</label>
+		<div class="controls">
+			<?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?>
+		</div>
+	</div>
+	<div class="controls">
+		<input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>">
+	</div>
+</form>
 
 
 <?php
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index 2045e6b66..ca1618d97 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -84,26 +84,31 @@ $(document).ready(function() {
 
 // Display the Review form.
 ?>
-<form method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
-<table class="table-condensed">
-<tr><td><?php echo(printMLText("comment")); ?>:</td>
-<td><textarea name="comment" cols="40" rows="4"></textarea>
-</td></tr>
-<tr><td><?php echo(printMLText("status")); ?>:</td>
-<td><select name="overrideStatus">
-<option value=''></option>
-<?php
+<form class="form-horizontal" method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
+	<div class="control-group">
+		<label class="control-label"><?php echo(printMLText("comment"));?>:</label>
+		<div class="controls">
+			<textarea name="comment" cols="40" rows="4"></textarea>
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label"><?php echo(printMLText("status")); ?>:</label>
+		<div class="controls">
+			<select name="overrideStatus">
+				<option value=''></option>
+	<?php
 
-		if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
-		if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
+			if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
+			if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
 
-?>
-</select>
-</td></tr><tr><td></td><td>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
-</td></tr></table>
+	?>
+	</select>
+	</div></div>
+	<div class="controls">
+		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+		<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
+	</div>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.PasswordForgotten.php b/views/bootstrap/class.PasswordForgotten.php
index d33c085f7..dcf88d2b2 100644
--- a/views/bootstrap/class.PasswordForgotten.php
+++ b/views/bootstrap/class.PasswordForgotten.php
@@ -73,27 +73,31 @@ document.form1.email.focus();
 ?>
 
 <?php $this->contentContainerStart(); ?>
-<form action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
+<form class="form-horizontal" action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
 <?php
 		if ($referrer) {
 			echo "<input type='hidden' name='referuri' value='".$referrer."'/>";
 		}
 ?>
   <p><?php printMLText("password_forgotten_text"); ?></p>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("login");?>:</td>
-			<td><input type="text" name="login" id="login"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("email");?>:</td>
-			<td><input type="text" name="email" id="email"></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>"></td>
-		</tr>
-	</table>
+
+		<div class="control-group">
+		<label class="control-label"><?php printMLText("login");?>:</label>
+			<div class="controls">
+			<input type="text" name="login" id="login">
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("email");?>:</label>
+			<div class="controls">
+				<input type="text" name="email" id="email">
+			</div>
+		</div>
+
+		<div class="controls">
+			<input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>">
+		</div>
+
 </form>
 <?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>