diff --git a/app/views/fields/_group_table.html.haml b/app/views/fields/_group_table.html.haml
index dd78813aab..5b3aaa7452 100644
--- a/app/views/fields/_group_table.html.haml
+++ b/app/views/fields/_group_table.html.haml
@@ -1,19 +1,19 @@
 %table
   - field_group.fields.without_pairs.in_groups_of(2, false) do |group|
-    %tr
-      - group.each_with_index do |field, i|
-        - span = field.as == 'autocomplete' ? 3 : 1
-        - if field.as == 'autocomplete' && i !=0 #autocomplete takes up one whole line
+    - group.each_with_index do |field, i|
+      - if field.as == 'autocomplete' #autocomplete takes up one whole line
+        %tr
+          %td{:colspan => 3}
+            = f.input field.name, field.input_options
+      - else
+        - if i == 0
           %tr
-            %td{:colspan => span}
-              = f.input field.name, field.input_options
-        - else
-          %td{:colspan => span}
-            - if field.hint.present?
-              = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
-            - if field.as == 'check_boxes'
-              - value = f.object.send(field.name)
-              - checked = YAML.load(value.to_s)
-            = f.input field.name, field.input_options.merge(:checked => checked)
+        %td
+          - if field.hint.present?
+            = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
+          - if field.as == 'check_boxes'
+            - value = f.object.send(field.name)
+            - checked = YAML.load(value.to_s)
+          = f.input field.name, field.input_options.merge(:checked => checked)
         - if i == 0
           %td= spacer