diff --git a/src/project/templates/project/plugins/content/download_section.html b/src/project/templates/project/plugins/content/download_section.html
index 7ed2886..321cc0d 100644
--- a/src/project/templates/project/plugins/content/download_section.html
+++ b/src/project/templates/project/plugins/content/download_section.html
@@ -6,8 +6,10 @@
                     <span class="download__item__file__icon">{{ item.extension }}</span>
                 </span>
                 <span class="download__item__title">{{ item.label }}</span>
-                <span class="download__item__description">{{ item.description }}</span>
-                <span class="downloads__item__tags">{{ item.tag_list }}</span>
+                <span class="download__item__description">
+                    {% if item.description %}{{ item.description }}{% endif %}
+                </span>
+                <span class="downloads__item__tags">{% if item.tag_list %}{{ item.tag_list }}{% endif %}</span>
                 <span class="download__item__icon">
                     {% include 'project/assets/download.svg' %}
                 </span>
diff --git a/templates/aldryn_forms/fields/multiplecheckboxselectfield.html b/templates/aldryn_forms/fields/multiplecheckboxselectfield.html
index 0185a52..cfec3aa 100644
--- a/templates/aldryn_forms/fields/multiplecheckboxselectfield.html
+++ b/templates/aldryn_forms/fields/multiplecheckboxselectfield.html
@@ -1,35 +1 @@
-{% load aldryn_forms_tags i18n %}
-
-{% if field %}
-    <div class="checkbox{% if field.field.required %} form-required{% endif %}{% if field.errors %} has-error{% endif %}">
-        {% block form_field_label %}
-            <p>
-                {{ field.label }}
-                {% if field.field.required %}
-                    <abbr title="{% trans "Required field" %}">*</abbr>
-                {% endif %}
-            </p>
-        {% endblock form_field_label %}
-        {% block form_field %}
-            {% for choice in field.field.choices %}
-                <label>
-                    <input type="checkbox" value="{{ choice.0 }}" name="{{ field.name }}" id="field-{{ choice.0 }}"
-                        {% if choice.0|force_text in field.value|force_text_list %} checked="checked"{% endif %}>
-                    {{ choice.1 }}
-                </label>
-            {% endfor %}
-        {% endblock form_field %}
-        {% block form_field_errors %}
-            {% if field.errors %}
-                {% for error in field.errors %}
-                    <span class="text-danger">{{ error }}</span>
-                {% endfor %}
-            {% endif %}
-        {% endblock form_field_errors %}
-        {% block form_field_help_text %}
-            {% if field.help_text %}
-                <p class="help-block">{{ field.help_text }}</p>
-            {% endif %}
-        {% endblock form_field_help_text %}
-    </div>
-{% endif %}
+{% extends "aldryn_forms/field.html" %}
\ No newline at end of file