diff --git a/templates/BootstrapTextField_holder.ss b/templates/BootstrapTextField_holder.ss
index 282ccdd..a2ae321 100755
--- a/templates/BootstrapTextField_holder.ss
+++ b/templates/BootstrapTextField_holder.ss
@@ -1,19 +1,25 @@
-<div id="$Name" class="<% if $AppendedText || $PrependedText %>input-group<% end_if %> $HolderClasses" $HolderAttributes>
-    <label for="$ID" class="$LabelClasses">$Title</label>
+<div id="$Name" class="$HolderClasses" $HolderAttributes>
+    <label for="$ID" class="$LabelClasses<% if $BootstrapLayout=='horizontal' %> control-label $GridLabelClass<% end_if %>">$Title</label>
+
+    <% if $BootstrapLayout=='horizontal' %><div class="$GridInputClass "><% end_if %>
+
+    <% if $AppendedText || $PrependedText %><div class="input-group"><% end_if %>
+
     <% if $PrependedText %>
         <span class="input-group-addon">$PrependedText</span>
     <% end_if %>
-    
-    $Field        
+
+    $Field
 
     <% if $AppendedText %>
-        <span class="input-group-addon">$AppendedText</span>          
+        <span class="input-group-addon">$AppendedText</span>
     <% end_if %>
 
-    <% if HelpText %>
-    <p class="help-block">$HelpText</p>
-    <% end_if %>
-    <% if InlineHelpText %>
-    <span class="help-inline">$InlineHelpText</span>
-    <% end_if %>    
+    <% if $HelpText %><p class="help-block">$HelpText</p><% end_if %>
+
+    <% if $InlineHelpText %><span class="help-inline">$InlineHelpText</span><% end_if %>
+
+    <% if $AppendedText || $PrependedText %></div><% end_if %>
+
+    <% if $BootstrapLayout=='horizontal' %></div><% end_if %>
 </div>