diff --git a/templates/edit.html b/templates/edit.html
index ff686ca..a1e0475 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -1,90 +1,91 @@
 {% extends "base.html" %}
 {% macro lexeme_form_link(wiki, lexeme_id, form) -%}
   <a href="https://{{ wiki }}.wikidata.org/wiki/Lexeme:{{ lexeme_id }}#{{ form.id | replace(lexeme_id + '-', '') }}">
     {% for representation in form.representations.values() -%}
     {{ representation | term_span }}
     {%- if not loop.last %}/{% endif -%}
     {%- endfor %}
     ({{ form.id }})</a>
 {%- endmacro %}
 {% macro lexeme_form_list_item(wiki, lexeme_id, form) %}
   <li>
     {{ message_with_kwargs( 'edit_form_list_item',
                             form_link=lexeme_form_link(wiki, lexeme_id, form),
                             grammatical_feature_labels=form.grammaticalFeatures_labels | map('term_span') if form.grammaticalFeatures_labels else [message( 'no_grammatical_features' )],
                             statements=form.get('claims', {}) | length ) | safe }}
   </li>
 {% endmacro %}
 {% block head %}
 {{ super() }}
 <script src="{{ url_for('static', filename='edit.js') }}"></script>
 <link rel="stylesheet" href="{{ url_for('static', filename='template.css') }}">
 <link rel="stylesheet" href="{{ url_for('static', filename='edit.css') }}">
 {% endblock %}
 {% block main_tag_attributes %}{{ super() }} lang="{{ template.language_code }}" dir="{{ template.language_code | text_direction }}"{% endblock main_tag_attributes %}
 {% block main %}
   <h1>{{ template.label }}</h1>
   <h2>
     <a href="https://{{ 'test' if template.test else 'www' }}.wikidata.org/wiki/Lexeme:{{ template.lexeme_id }}">
       {% for lemma in lemmas.values() -%}
       {{ lemma | term_span }}
       {%- if not loop.last %}/{% endif -%}
       {%- endfor %}
       ({{ template.lexeme_id }})
     </a>
   </h2>
   {% if not lexeme_matches_template %}
   <div class="alert alert-danger">
     {{ message( 'edit_mismatch_warning' ) }}
   </div>
   {% endif %}
   <div class="alert alert-warning">
     {{ message( 'edit_general' ) }}
   </div>
   {% if csrf_error %}
   <div class="alert alert-warning">
     {{ message( 'csrf_warning' ) }}
   </div>
   {% endif %}
   {% if template.ambiguous_lexeme_forms %}
   <div class="alert alert-warning">
     {{ message_with_kwargs( 'edit_ambiguous_warning', forms=template.ambiguous_lexeme_forms | length ) }}
     <ul>
       {% for lexeme_form in template.ambiguous_lexeme_forms %}
       {{ lexeme_form_list_item('test' if template.test else 'www', template.lexeme_id, lexeme_form) }}
       {% endfor %}
     </ul>
   </div>
   {% endif %}
   {% if template.unmatched_lexeme_forms %}
   <div class="alert alert-warning">
     {{ message_with_kwargs( 'edit_unmatched_warning', forms=template.unmatched_lexeme_forms | length ) }}
     <ul>
       {% for lexeme_form in template.unmatched_lexeme_forms %}
       {{ lexeme_form_list_item('test' if template.test else 'www', template.lexeme_id, lexeme_form) }}
       {% endfor %}
     </ul>
   </div>
   {% endif %}
   <form method="post" autocapitalize="off">
     <input name="_csrf_token" type="hidden" value="{{ csrf_token() }}">
     <input name="_lexeme_revision" type="hidden" value="{{ template.lexeme_revision }}">
     <dl{% if template.has_sections %} class="with-sections"{% endif %}>
       <div class="section">
         {% for form in template.forms %}
         {% if form.section_break %}
         <div class="section-spacer"></div>
       </div>
       <hr>
       <div class="section">
         {% endif %}
         <div class="form">
           <dt>{{ form.label }}</dt>
           <dd>{{ form | form2input(loop.first) }}</dd>
         </div>
         {% endfor %}
+        <div class="section-spacer"></div>
       </div>
     </dl>
     <button class="btn btn-primary">{{ message( 'edit' ) }}</button>
   </form>
 {% endblock main %}
diff --git a/templates/template.html b/templates/template.html
index d393ec7..2dcb338 100644
--- a/templates/template.html
+++ b/templates/template.html
@@ -1,70 +1,71 @@
 {% extends "base.html" %}
 {% block head %}
 {{ super() }}
 <script src="https://tools-static.wmflabs.org/cdnjs/ajax/libs/lodash.js/4.17.10/lodash.min.js"></script>
 <script src="{{ url_for('static', filename='findDuplicates.js') }}"></script>
 <script src="{{ url_for('static', filename='alertPartialForms.js') }}"></script>
 <link rel="stylesheet" href="{{ url_for('static', filename='template.css') }}">
 {% endblock %}
 {% block main_tag_attributes %}{{ super() }} lang="{{ template.language_code }}" dir="{{ template.language_code | text_direction }}" data-template='{{ template | tojson }}'{% endblock main_tag_attributes %}
 {% block main %}
   <h1>{{ template.label }}</h1>
   {% if advanced %}
   <div class="alert alert-primary">
     {{ message( 'advanced_general' ) }}
     <ul>
       <li>{{ message( 'advanced_lexeme_id' ) }}</li>
       <li>{{ message( 'advanced_partial_forms' ) }}</li>
     </ul>
   </div>
   {% endif %}
   {% if csrf_error %}
   <div class="alert alert-warning">
     {{ message( 'csrf_warning' ) }}
   </div>
   {% endif %}
   {{ duplicates | render_duplicates(template.language_code, actionable=True) | safe }}
   <form method="post" autocapitalize="off">
     <input name="_csrf_token" type="hidden" value="{{ csrf_token() }}">
     {% if advanced %}
     <label>
       {{ message( 'lexeme_id' ) }}
       <input name="lexeme_id" pattern="^L[1-9][0-9]*$" placeholder="L123" {% if template.lexeme_id %}value="{{ template.lexeme_id }}"{% endif %}>
     </label>
     {% endif %}
     <dl{% if template.has_sections %} class="with-sections"{% endif %}>
       <div class="section">
         {% for form in template.forms %}
         {% if form.section_break %}
         <div class="section-spacer"></div>
       </div>
       <hr>
       <div class="section">
         {% endif %}
         <div class="form">
           <dt>{{ form.label }}</dt>
           <dd>{{ form | form2input(loop.first) }}</dd>
         </div>
         {% endfor %}
+        <div class="section-spacer"></div>
       </div>
     </dl>
     {% if template.generated_via %}
     <div class="form-group">
       <label class="text-muted">
         {{ message( 'generated_via' ) }}
         <input name="generated_via" value="{{ template.generated_via }}" readonly>
       </label>
     </div>
     {% endif %}
     {% if duplicates %}
     {{ render_no_duplicate(template.language_code) | safe }}
     {% endif %}
     <button id="submit" class="btn btn-{% if not advanced %}primary{% else %}danger{% endif %}">{{ message( 'create' ) }}</button>
     {% if not advanced %}
     <button formnovalidate formaction="{{ url_for('process_template_advanced', template_name=template['@template_name']) }}" class="btn btn-secondary">{{ message( 'advanced' ) }}</button>
     {% endif %}
     {% if can_use_bulk_mode %}
     <button formnovalidate formaction="{{ url_for('process_template_bulk', template_name=template['@template_name']) }}" class="btn btn-secondary">{{ message('bulk_button') }}</button>
     {% endif %}
   </form>
 {% endblock main %}