diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
index 424e564d..a41b2835 100644
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@@ -168,7 +168,7 @@
 		{% for k in o.komentare %}
     	<hr>
 		<div class='comment' id='k{{k.id}}'>
-    		<span class='corr-header'>
+    		<div class='corr-header'>
         		<div class='author'>{{k.autor}}</div>
             	<span class="float-right">
 		<!-- Komentar !-->
@@ -177,17 +177,30 @@
                     	<input type='hidden' name='pdf' value='{{pdf.id}}'>
 						<input type='hidden' name='id' value='{{k.id}}'>
                     	<input type='hidden' name='scroll'>
-                    	<button type='submit' name='action' value='del-comment' title='Smaž komentář'
-                      	onclick='return confirm("Opravdu smazat komentář?")'>
-              <img src="{% static "korektury/imgs/delete.png" %}"/>
-					 	</button>
+                        {% if forloop.last %}
+                    	  <button type='submit' name='action' value='del-comment' title='Smaž komentář'
+                      	  onclick='return confirm("Opravdu smazat komentář?")'>
+                            <img src="{% static "korektury/imgs/delete.png" %}"/>
+					 	  </button>
+                        {% else %}
+                          <button name='action' value='del-comment' type='button'
+            			  title="Komentář nelze smazat &ndash; existuje novější">
+                            <img src="{% static "korektury/imgs/delete-gr.png"%}"/>
+                          </button>
+                        {% endif %}
                     </form>
 					<!-- /Komentar !-->
-					<button type='button' onclick='update_comment(this);' title='Uprav komentář'>
-            <img src="{% static "korektury/imgs/edit.png"%}"/>
-					</button>
+                    {% if forloop.last %}
+					  <button type='button' onclick='update_comment(this);' title='Uprav komentář'>
+                        <img src="{% static "korektury/imgs/edit.png"%}"/>
+					  </button>
+                    {% else %}
+                      <button type='button' title="Komentář nelze upravit &ndash; existuje novější">
+                        <img src="{% static "korektury/imgs/edit-gr.png" %}"/>
+                      </button>
+                    {% endif %}
 				</div>
-			</span>
+			</div>
 			<div id='kt{{k.id}}'>{{k.text}}</div>
 		</div>
 		{% endfor %}