diff --git a/the_works/templates/views/text_detail.html b/the_works/templates/views/text_detail.html
index f4480a1..bef9df1 100644
--- a/the_works/templates/views/text_detail.html
+++ b/the_works/templates/views/text_detail.html
@@ -24,12 +24,15 @@ Text bearbeiten
 
 {% block content %}
 <form id="text_detail_form" method="post" action="#">
-  <div class="grid">
+  <section>
+    <label>
+      <span class="required">Titel</span>
+      <input class="required" id="form_Titel" name="form_Titel" aria-Label="Titel" placeholder="Titel" required value="{{ text['Titel'] }}" />
+    </label>
+  </section>
+  <hr />
+  <section class="grid">
     <div>
-      <label>
-        <span class="required">Titel</span>
-        <input class="required" id="form_Titel" name="form_Titel" aria-Label="Titel" placeholder="Titel" required value="{{ text['Titel'] }}" />
-      </label>
       <label>
         Untertitel
         <input id="form_Untertitel" name="form_Untertitel" aria-Label="Untertitel" placeholder="Untertitel" value="{{ text['Untertitel'] }}" />
@@ -41,6 +44,8 @@ Text bearbeiten
           {% for r in reihen %}<option value="{{ r.ID }}"{% if r.ID == text['Reihe'] %} selected{% endif %}>{{ r.Titel }}</option>{% endfor %}
         </select>
       </label>
+    </div>
+    <div>
       <label>
         <span class="required">Textform</span>
         <select id="form_Textform" name="form_Textform" aria-label="Textform" required>
@@ -56,21 +61,17 @@ Text bearbeiten
         </select>
       </label>
     </div>
-    <div>
-      <fieldset>
-        <legend>Genre(s)</legend>
-        <div class="grid">
-          {% for g in genres %}
-          <div><label>
-            <input name="form_Genres" type="checkbox" value="{{ g.ID }}" {% if g.ID in text["Genres"] %} checked {% endif %}/>
-            {{ g.Genre }}
-          </label></div>
-        {{ loop.cycle('', '</div><div class="grid">' | safe) }}  
-          {% endfor %}
-        </div>
-      </fieldset>
-    </div>
-  </div>
+  </section>
+  <hr />
+  <section>
+    <fieldset>
+      <legend>Genre(s)</legend>
+      {% for g in genres %}
+      <input id="form_Genres_{{ g.ID }}" name="form_Genres" type="checkbox" value="{{ g.ID }}" {% if g.ID in text["Genres"] %} checked {% endif %}/>
+      <label for="form_Genres_{{ g.ID }}">{{ g.Genre }}</label>
+      {% endfor %}
+    </fieldset>
+  </section>
 
   <footer class="grid">
     <button id="form_submit" type="submit" formmethod="post" formaction="{% if create_mode %}{{ url_for('text.create') }}{% else %}{{ url_for('text.update', id=text['ID']) }}{% endif %}">