diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 58f6c1263..c5a7b052c 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -70,26 +70,27 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 					if(!in_array($attrdef->getID(), $attrdefids)) {
 						$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
 						if(is_array($arr)) {
-							echo $txt;
-							echo "<tr>";
-							echo "<td>".$arr[0]."</td>";
-							echo "<td>".$arr[1]."</td>";
-							echo "</tr>";
+							if($arr) {
+								echo "<div class=\"control-group\"";
+								echo "<label class=\"control-label\">".$arr[0]."</label>";
+								echo "<div class=\"controls\>".$arr[1]."</div>";
+								echo "</div>";
+							}
 						} else {
 ?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?><?php echo $shows ? " (".implode(", ", $shows).")" : ''; ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></td>
-</tr>
+<div class="control-group">
+	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?><?php echo $shows ? " (".implode(", ", $shows).")" : ''; ?>:</label>
+	<div class="controls"><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></div>
+</div>
 <?php
 						}
 						$attrdefids[] = $attrdef->getID();
 					} else {
 ?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php echo $folder->getAttribute($attrdef)->getValue(); ?></td>
-</tr>
+<div class="control-group">
+	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
+	<div class="controls"><?php echo $folder->getAttribute($attrdef)->getValue(); ?></div>
+</div>
 <?php
 					}
 				}
@@ -113,10 +114,10 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 			} else {
 				if($attribute = $folder->getAttribute($attrdef)) {
 ?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php echo $attribute->getValue() ?></td>
-</tr>
+<div class="control-group">
+	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
+	<div class="controls"><?php echo $attribute->getValue() ?></div>
+</div>
 <?php
 				}
 			}