diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index 6a7bd3f94..4cdfe4601 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -1,25 +1,25 @@
 {% block form_row %}
 {% spaceless %}
         <div class="{% spaceless %}
-            {% if attr.class is defined and 'only-label' in attr.class %} 
+            {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %} 
                 grid-12
-            {% elseif attr.class is defined and 'no-label' in attr.class %} 
-                grid-0
             {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} 
-                grid-2   grid-mobile-4 grid-tablet-4 mobile-clear tablet-clear
+                grid-2  grid-mobile-4 grid-tablet-4 mobile-clear tablet-clear
             {% else %}
                 grid-4 clear
             {% endif %}
         {% endspaceless %}">
-        {{ form_label(form) }}
+        {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %} 
+            {{ form_label(form) }}
+        {% endif %}
         </div>
         <div class="{% spaceless %}
-            {% if attr.class is defined and 'only-label' in attr.class %} 
-                grid-12 parent
-            {% elseif attr.class is defined and 'no-label' in attr.class %} 
+            {% if attr.class is defined and 'cf-title' in attr.class  %} 
                 grid-12
+            {% elseif attr.class is defined and 'cf-fields' in attr.class %}
+                grid-12 parent
             {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} 
-                grid-2 grid-mobile-8 grid-tablet-8
+                grid-2 grid-mobile-8 grid-tablet-8 multiple-cf-inline
             {% else %}
                 grid-8
             {% endif %}
@@ -28,7 +28,7 @@
             {{ form_errors(form) }}
         </div>
 {% endspaceless %}
-{% endblock form_row %}    
+{% endblock form_row %}
     
 {% block choice_widget_expanded %}
 {% spaceless %}