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 c2144c915..b8b6ee7cf 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->getAttributeValue($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->getAttributeValue($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.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>