diff --git a/templates/BootstrapForm.ss b/templates/BootstrapForm.ss
index c7d21eb..0b6f209 100755
--- a/templates/BootstrapForm.ss
+++ b/templates/BootstrapForm.ss
@@ -4,15 +4,15 @@
 	<% if $Message %>
 		<% if $MessageType == "good" %>
                 <div id="{$FormName}_error" class="alert alert-success" role="alert">$Message</div>
-		<% else_if MessageType == "info" %>
+		<% else_if $MessageType == "info" %>
                 <div id="{$FormName}_error" class="alert alert-info" role="alert">$Message</div>
-		<% else_if MessageType == "bad" %>
+		<% else_if $MessageType == "bad" %>
                 <div id="{$FormName}_error" class="alert alert-danger" role="alert">$Message</div>
 		<% end_if %>
 	<% end_if %>
-	
+
 	<fieldset>
-		<% if $Legend %><legend>$Legend</legend><% end_if %> 
+		<% if $Legend %><legend>$Legend</legend><% end_if %>
 		<% loop $Fields %>
 			$FieldHolder
 		<% end_loop %>
@@ -20,11 +20,22 @@
 	</fieldset>
 
 	<% if $Actions %>
-	<div class="form-actions">
-		<% loop $Actions %>
-			$Field
-		<% end_loop %>
-	</div>
+        <% if $formLayout=='horizontal' %>
+            <div class="form-group">
+                <div class="$gridActionClass">
+        <% else %>
+            <div class="form-actions">
+        <% end_if %>
+
+        <% loop $Actions %>
+            $Field
+        <% end_loop %>
+
+        <% if $formLayout=='horizontal' %>
+            </div>
+        <% end_if %>
+
+	    </div>
 	<% end_if %>
 <% if $IncludeFormTag %>
 </form>