diff --git a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
index 9b8fc4701..542a429c6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -56,12 +56,7 @@ class CommentType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
-            $view->vars,
-            [
-                'fullWidth' => true,
-            ]
-        );
+        $view->vars['fullWidth'] = true;
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index f65677dc7..79ed6df40 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -95,12 +95,7 @@ class ScopePickerType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
-            $view->vars,
-            [
-                'fullWidth' => true,
-            ]
-        );
+        $view->vars['fullWidth'] = true;
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 15d7625dd..83958b22e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -18,41 +18,42 @@
 
 {% block form_row %}
 {% apply spaceless %}
-    {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
     <div class="mb-2">
         <div class="row">
-            <div class="{% apply spaceless %}
-                {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
-                    col-sm-12
-                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
-                    col-sm-2 col-md-4 clear
-                {% else %}
-                    col-sm-4 clear
+            {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %} {# here #}
+                <div class="{% apply spaceless %}
+                    {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
+                        col-sm-12
+                    {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                        col-sm-2 col-md-4 clear
+                    {% else %}
+                        col-sm-4 clear
+                    {% endif %}
+                {% endapply %}">
+                {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
+                    {{ form_label(form) }}
                 {% endif %}
-            {% endapply %}">
-            {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
-                {{ form_label(form) }}
+                </div>
+                <div class="{% apply spaceless %}
+                    {% if attr.class is defined and 'cf-title' in attr.class  %}
+                        col-sm-12
+                    {% elseif attr.class is defined and 'cf-fields' in attr.class %}
+                        col-sm-12 parent
+                    {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                        col-sm-2 col-md-8 multiple-cf-inline
+                    {% else %}
+                        col-sm-8
+                    {% endif %}
+                {% endapply %}">
+                    {{ form_widget(form) }}
+                    {{ form_errors(form) }}
+                </div>
+            {% else %}
+                <div class="col-12 clear">{{ form_label(form) }}</div>
+                <div class="col-12">{{ form_widget(form) }}</div>
             {% endif %}
-            </div>
-            <div class="{% apply spaceless %}
-                {% if attr.class is defined and 'cf-title' in attr.class  %}
-                    col-sm-12
-                {% elseif attr.class is defined and 'cf-fields' in attr.class %}
-                    col-sm-12 parent
-                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
-                    col-sm-2 col-md-8 multiple-cf-inline
-                {% else %}
-                    col-sm-8
-                {% endif %}
-            {% endapply %}">
-                {{ form_widget(form)  }}
-                {{ form_errors(form) }}
-            </div>
         </div>
     </div>
-    {% else %}
-        {{ form_widget(form)  }}
-    {% endif %}
 {% endapply %}
 {% endblock form_row %}
 
@@ -210,11 +211,6 @@
     {% endfor %}
 {% endblock %}
 
-{% block comment_row %}
-    {{ form_label(form) }}
-    {{ form_row(form) }}
-{% endblock %}
-
 {% block comment_widget %}
     {% for entry in form %}
         {{ form_widget(entry) }}