diff --git a/seminar/templates/seminar/nahraj_reseni.html b/seminar/templates/seminar/nahraj_reseni.html
index d95f8567..7fa02da7 100644
--- a/seminar/templates/seminar/nahraj_reseni.html
+++ b/seminar/templates/seminar/nahraj_reseni.html
@@ -15,18 +15,41 @@
 <form enctype="multipart/form-data" action="{% url 'seminar_nahraj_reseni' %}" method="post">
   {% csrf_token %}
 {{ form }}
+
+<hr>
+
 {{ prilohy.management_form }}
 
 
-<h4>Přilohy s řešením</h4>
+<h4>Soubory s řešením</h4>
 
 <div id="form_set">
 {% for form in prilohy.forms %}
 	<div class="attachment">
 	{{ form.non_field_errors }}
-	{{ form.errors }}
-        <table class='no_error'>
-            {{ form }}
+	{# {{ form.errors }} FIXME: možná tohle chceme zobrazovat? #}
+        <table class='form' id=''>
+
+          <tr>
+          {% for field in form.visible_fields %}
+
+              <td>
+                <label class="field-label{% if field.field.required %} field-required{% endif %}" for="{{ field.id_for_label }}">
+                  {{ field.label }}:
+                </label>
+
+              </td>
+              <td {% if field.help_text %} class="field-with-comment"{% endif %}>
+                {{ field }}
+                <span class="field-comment">{{ field.help_text|safe }}
+              </td>
+
+            <td><span class="field-error">{{ field.errors }}</span></td>
+
+            {# TODO #}
+          {% endfor %}
+          </tr>
+
         </table>
 	<input type="button" value="Odebrat přílohu" class="remove_attachment" id="{{form.prefix}}-jsremove">
 	</div>
@@ -45,7 +68,7 @@
 </div>
 
 <hr>
-<h4>Odevzdat má řešení</h4>
+<h4>Odevzdat řešení</h4>
 <input type="submit" value="Odevzdat">
 </form>