diff --git a/odevzdavatko/templates/odevzdavatko/prilohy.html b/odevzdavatko/templates/odevzdavatko/prilohy.html
index e6d4ea42..4946546b 100644
--- a/odevzdavatko/templates/odevzdavatko/prilohy.html
+++ b/odevzdavatko/templates/odevzdavatko/prilohy.html
@@ -15,7 +15,7 @@
           {% for field in form.visible_fields %}
 
               <td>
-                <label class="field-label{% if field.field.required %} field-required{% endif %}" for="{{ field.id_for_label }}">
+		      <label class="field-label{% if field.field.required %} field-required{% endif %}{% if field.errors%} field-error{% endif %}" for="{{ field.id_for_label }}">
                   {{ field.label }}:
                 </label>
 
@@ -25,7 +25,6 @@
                   <span class="field-comment">{{ field.help_text|safe }}</span>
               </td>
 
-            <td><span class="field-error">{{ field.errors }}</span></td>
 
           {% endfor %}
 
@@ -33,6 +32,11 @@
           <input type="button" value="Odebrat přílohu" class="remove_attachment" id="{{form.prefix}}-jsremove">
         </td>
 	</tr>
+	<tr>
+          {% for field in form.visible_fields %}
+	  <td rowspan="2"><span class="field-error">{% for error in field.errors %}{{error}} {% endfor %}</span></td>
+          {% endfor %}
+	</tr>
   </table>
 	</div>
 {% endfor %}
@@ -58,8 +62,6 @@
                 <span class="field-comment">{{ field.help_text|safe }}</span>
               </td>
 
-            <td><span class="field-error">{{ field.errors }}</span></td>
-
           {% endfor %}
 
         <td>
@@ -68,6 +70,14 @@
 	<input type="button" value="Odebrat přílohu" class="remove_attachment" id="id_prilohy-__prefix__-jsremove">
   </td>
 </tr>
+<tr>
+          {% for field in prilohy.empty_form.visible_fields %}
+
+            <td rowspan="2"><span class="field-error">{{ field.errors }}</span></td>
+
+          {% endfor %}
+
+</tr>
 </table>
 	</div>
 </div>