diff --git a/korektury/static/korektury/imgs/hide.png b/korektury/static/korektury/imgs/hide.png
index bcaeec04..e58ddb03 100644
Binary files a/korektury/static/korektury/imgs/hide.png and b/korektury/static/korektury/imgs/hide.png differ
diff --git a/korektury/static/korektury/opraf.js b/korektury/static/korektury/opraf.js
index 61eb5ce9..08b6149e 100644
--- a/korektury/static/korektury/opraf.js
+++ b/korektury/static/korektury/opraf.js
@@ -132,12 +132,15 @@ function img_click(element, ev) {
 function toggle_visibility(oid){
 	var buttondiv = document.getElementById(oid+'-buttons')
 	var text = document.getElementById(oid+'-body');
+    var toggleimg = document.getElementById(oid+'-toggleimg');
 	if (text.style.display == 'none'){
 		text.style.display = 'block';
 		buttondiv.style.display = 'inline-block';
+        toggleimg.style.transform = "";
 	}else {
 		text.style.display = 'none';
 		buttondiv.style.display = 'none';
+        toggleimg.style.transform = "rotate(180deg)";
 	}
 	for (var i=0;i<comments.length-1;i++){
 		 place_comments_one_div(comments[i][0], comments[i][1])
diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
index 3b327d69..783c6910 100644
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@@ -111,8 +111,35 @@
 	    onmouseover='box_onmouseover(this)' 
 	    onmouseout='box_onmouseout(this)'> 
 
-    	<div class='corr-header'> 
-			<span class='author' id='op{{o.id}}-autor'>{{o.autor}}</span>
+		<div class='corr-body' id='op{{o.id}}-body'>
+
+		{% for k in o.komentare %}
+		<div class='comment' id='k{{k.id}}'>
+    		<div class='corr-header'>
+        		<div class='author'>{{k.autor}}</div>
+            	<div class="float-right">
+		<!-- Komentar !-->
+                    <form  action='' onsubmit='save_scroll(this)' method='POST'>
+						{% csrf_token %}
+						<input type='hidden' name='id' value='{{k.id}}'>
+                    	<input type='hidden' name='scroll'>
+                    	  <button style="display: none" type='submit' name='action' value='del-comment' title='Smaž komentář'
+                      	  onclick='return confirm("Opravdu smazat komentář?")'>
+                            <img src="{% static "korektury/imgs/delete.png" %}"/>
+					 	            </button>
+                    </form>
+					<!-- /Komentar !-->
+                        <button type='button' onclick="update_comment('op{{o.id}}','kt{{k.id}}');" title='Uprav komentář'>
+                                    <img src="{% static "korektury/imgs/edit.png"%}"/>
+                        </button>
+				</div>
+			</div>
+			<div id='kt{{k.id}}'>{{k.text|linebreaks}}</div>
+		</div>
+    	<hr>
+		{% endfor %} 
+		</div>
+    	<div class='corr-header'>
 			<span class='float-right'>
 				<span id='op{{o.id}}-buttons'>
 				<!-- Existujici korektura !-->
@@ -122,16 +149,9 @@
 	   				<input type='hidden' name='id' value='{{o.id}}'>
 	   				<input type='hidden' name='scroll'>
 	   				
-					{% if o.komentare %}
-	   				<button name='action' value='del' type='button'
-            			title="Opravu nelze smazat &ndash; už ji někdo okomentoval">
-                  <img src="{% static "korektury/imgs/delete-gr.png"%}"/>
-	   				</button>
-					{% else %}
-					<button type='submit' name='action' value='del' title='Smaž opravu'>
+					<button style="display: none" type='submit' name='action' value='del' title='Smaž opravu'>
             <img src="{% static "korektury/imgs/delete.png"%}"/>
-					</button>
-					{% endif %} 
+					</button> 
 					{% if o.status != o.STATUS.K_OPRAVE %}
 					<button type='submit' name='action' value='{{ o.STATUS.K_OPRAVE }}' title='Označ jako neopravené'>
             <img src="{% static "korektury/imgs/undo.png"%}"/>
@@ -155,15 +175,6 @@
 				</form>
 				<!-- /Existujici korektura !-->
 						
-				{% if o.komentare %}
-				<button type='button' title="Korekturu nelze upravit &ndash; už ji někdo okomentoval">
-          <img src="{% static "korektury/imgs/edit-gr.png" %}"/>
-				</button>
-				{% else %}
-				<button type='button' onclick='box_edit("op{{o.id}}","update");' title='Oprav opravu'>
-          <img src="{% static "korektury/imgs/edit.png" %}"/>
-				</button>
-				{% endif %}
 				{% if o.status == 'opraveno' or o.status == 'neni_chyba'  %}
 				<button type='button' title='Korekturu nelze komentovat, protože už je uzavřená'>
           <img src="{% static "korektury/imgs/comment-gr.png" %}"/>
@@ -176,53 +187,11 @@
 
 				</span>
 				<button type='button' onclick='toggle_visibility("op{{o.id}}");' title='Skrýt/Zobrazit'>
-          <img src="{% static "korektury/imgs/hide.png" %}"/>
+          <img id='op{{o.id}}-toggleimg' src="{% static "korektury/imgs/hide.png" %}"/>
 				</button>
 
 			</span>
 		</div>
-		<div class='corr-body' id='op{{o.id}}-body'>
-		<div id='op{{o.id}}-text'>{{o.text|linebreaks}}</div>
-
-		{% for k in o.komentare %}
-    	<hr>
-		<div class='comment' id='k{{k.id}}'>
-    		<div class='corr-header'>
-        		<div class='author'>{{k.autor}}</div>
-            	<div class="float-right">
-		<!-- Komentar !-->
-                    <form  action='' onsubmit='save_scroll(this)' method='POST'>
-						{% csrf_token %}
-						<input type='hidden' name='id' value='{{k.id}}'>
-                    	<input type='hidden' name='scroll'>
-                        {% 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 !-->
-                    {% if forloop.last %}
-					  <button type='button' onclick="update_comment('op{{o.id}}','kt{{k.id}}');" 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>
-			</div>
-			<div id='kt{{k.id}}'>{{k.text|linebreaks}}</div>
-		</div>
-		{% endfor %} 
-		</div>
 	</div>	
 	{% endfor %}