diff --git a/CHANGELOG.md b/CHANGELOG.md
index 982f8017..3567f7d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
+# v2.2.0
+## 03/13/2017
+
+1. [](#new)
+    * Added new `fieldset` form field [#125](https://github.com/getgrav/grav-plugin-form/issues/125)
+    * Added new `conditional form field` to show fields only if some `condition` is set
+1. [](#improved)
+    * Added the option to have outerclasses on buttons [#124](https://github.com/getgrav/grav-plugin-form/issues/124)
+    * Added the option to disable fields label if not defined [#126](https://github.com/getgrav/grav-plugin-form/issues/126)
+
 # v2.1.1
 ## 02/17/2017
 
 1. [](#improved)
     * Better default output for select, checkbox and checkboxes fields in the form destination page and in the emails sent via form submit [#121](https://github.com/getgrav/grav-plugin-form/issues/121)
 
+
 # v2.1.0
 ## 02/10/2017
 
diff --git a/blueprints.yaml b/blueprints.yaml
index f12c2aea..192aef1a 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 2.1.1
+version: 2.2.0
 description: Enables the forms handling
 icon: check-square
 author:
diff --git a/templates/forms/default/field.html.twig b/templates/forms/default/field.html.twig
index 5b818898..b8d8d98f 100644
--- a/templates/forms/default/field.html.twig
+++ b/templates/forms/default/field.html.twig
@@ -7,18 +7,20 @@
 {% block field %}
     <div class="form-field {% if field.outerclasses is defined %} {{ field.outerclasses }}{% endif %}{% if errors %} has-errors{% endif %} {% block outer_field_classes %}{% endblock %}">
         {% block contents %}
-            <div class="form-label">
-                <label class="inline" {% if field.id is defined %}for="{{ field.id|e }}" {% endif %} >
-                {% block label %}
-                    {% if field.help %}
-                    <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|t|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
-                    {% else %}
-                    {{ field.label|default(field.name|capitalize)|t }}
-                    {% endif %}
-                    {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
-                {% endblock %}
-                </label>
-            </div>
+            {% if field.label is not same as(false) %}
+                <div class="form-label">
+                    <label class="inline" {% if field.id is defined %}for="{{ field.id|e }}" {% endif %} >
+                    {% block label %}
+                        {% if field.help %}
+                        <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|t|e }}">{{ field.label|default(field.name|capitalize)|t }}</span>
+                        {% else %}
+                        {{ field.label|default(field.name|capitalize)|t }}
+                        {% endif %}
+                        {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
+                    {% endblock %}
+                    </label>
+                </div>
+            {% endif %}
             <div class="form-data"
                 {% block global_attributes %}
                 data-grav-field="{{ field.type }}"
diff --git a/templates/forms/default/form.html.twig b/templates/forms/default/form.html.twig
index 481d3923..8e6dd09a 100644
--- a/templates/forms/default/form.html.twig
+++ b/templates/forms/default/form.html.twig
@@ -49,22 +49,24 @@
   {% endblock %}
 
   {% for button in form.buttons %}
-      {% if button.url %}
-          <a href="{{ button.url starts with 'http' ? button.url : url(button.url) }}">
-      {% endif %}
-      <button
-            {% if button.id %}id="{{ button.id }}"{% endif %}
-            {% block button_classes %}
-            class="{{ button.classes|default('button') }}"
-            {% endblock %}
-            {% if button.disabled %}disabled="disabled"{% endif %}
-            type="{{ button.type|default('submit') }}"
-        >
-            {{ button.value|t|default('Submit') }}
-      </button>
-      {% if button.url %}
-          </a>
-      {% endif %}
+      <div class="{% if button.outerclasses is defined %} {{ button.outerclasses }}{% endif %}">
+          {% if button.url %}
+              <a href="{{ button.url starts with 'http' ? button.url : url(button.url) }}">
+          {% endif %}
+          <button
+                {% if button.id %}id="{{ button.id }}"{% endif %}
+                {% block button_classes %}
+                class="{{ button.classes|default('button') }}"
+                {% endblock %}
+                {% if button.disabled %}disabled="disabled"{% endif %}
+                type="{{ button.type|default('submit') }}"
+            >
+                {{ button.value|t|default('Submit') }}
+          </button>
+          {% if button.url %}
+              </a>
+          {% endif %}
+      </div>
   {% endfor %}
 
   {% block inner_markup_buttons_end %}
diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig
index e2270f0a..f7b53ce5 100644
--- a/templates/forms/fields/checkbox/checkbox.html.twig
+++ b/templates/forms/fields/checkbox/checkbox.html.twig
@@ -24,6 +24,6 @@
             {% endblock %}
             />
 
-        <label class="inline"{% if field.id is defined %} for="{{ field.id|e }}"{% endif %}>{{ field.label|t|e }} {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}</label>
+        <label style="display:inline;" class="inline"{% if field.id is defined %} for="{{ field.id|e }}"{% endif %}>{{ field.label|t|e }} {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}</label>
     </div>
 {% endblock %}
diff --git a/templates/forms/fields/conditional/conditional.html.twig b/templates/forms/fields/conditional/conditional.html.twig
new file mode 100644
index 00000000..5cd861c2
--- /dev/null
+++ b/templates/forms/fields/conditional/conditional.html.twig
@@ -0,0 +1,18 @@
+{% if evaluate(field.condition) == 'true' %}
+    {% if field.classes %}
+    <div class="{{ field.classes }}">
+    {% endif %}
+
+    {% if field.fields %}
+        {% for field in field.fields %}
+            {% if field.type %}
+                {% set value = data.value(field.name) %}
+                {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+
+    {% if field.classes %}
+    </div>
+    {% endif %}
+{% endif %}
diff --git a/templates/forms/fields/fieldset/fieldset.html.twig b/templates/forms/fields/fieldset/fieldset.html.twig
new file mode 100644
index 00000000..36a30517
--- /dev/null
+++ b/templates/forms/fields/fieldset/fieldset.html.twig
@@ -0,0 +1,14 @@
+<fieldset {% if field.id is defined %}id="{{ field.id }}"{% endif %} {% if field.classes is defined %}class="{{ field.classes }}" {% endif %}>
+{% if field.legend %}
+    <legend>{% if grav.twig.twig.filters['tu'] is defined %}{{ field.legend|tu }}{% else %}{{ field.legend|t }}{% endif %}</legend>
+{% endif %}
+
+{% if field.fields %}
+    {% for field in field.fields %}
+        {% if field.type %}
+            {% set value = data.value(field.name) %}
+            {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+        {% endif %}
+    {% endfor %}
+{% endif %}
+</fieldset>
\ No newline at end of file
diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig
index b4381d0a..5abf2630 100644
--- a/templates/forms/fields/radio/radio.html.twig
+++ b/templates/forms/fields/radio/radio.html.twig
@@ -16,7 +16,7 @@
                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                    {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
             />
-            <label style="display: inline" for="{{ id|e }}">{{ text|e }}</label>
+            <label style="display: inline" class="inline" for="{{ id|e }}">{{ text|e }}</label>
         </span>
     {% endfor %}
 {% endblock %}