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();