diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
index 9bb1525e..251f722f 100644
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@@ -15,152 +15,155 @@
 	<hr/>
 
 	<div id="commform-div">
-	<form action='' onsubmit='save_scroll(this)' id="commform" method="POST">
-		{% csrf_token %}
-	  <input size="8" name="au" value="{{autor}}"/>
-	  <input type=submit value="Oprav!"/>
-	  <button type="button" onclick="close_commform()">Zavřít</button>
-	  <br/>
-	  <textarea onkeypress="textarea_onkey(event);" id="commform-text" cols=40 rows=10 name="txt"></textarea>
-	  <br/>
-	  <input type="hidden" size="3" name="pdf" value='{{pdf.id}}'/>
-	  <input type="hidden" size="3" id="commform-x" name="x"/>
-	  <input type="hidden" size="3" id="commform-y" name="y"/>
-	  <input type="hidden" size="3" id="commform-img-id" name="img-id"/>
-	  <input type="hidden" size="3" id="commform-id" name="id"/>
-	  <input type="hidden" size="3" id="commform-action" name="action"/>
-	  <input type="hidden" size="3" id="commform-action" name="scroll"/>
-	</form>
+		<!-- Pridat korekturu / komentar !-->
+		<form action='' onsubmit='save_scroll(this)' id="commform" method="POST">
+			{% csrf_token %}
+			<input size="8" name="au" value="{{autor}}"/>
+			<input type=submit value="Oprav!"/>
+			<button type="button" onclick="close_commform()">Zavřít</button>
+	  		<br/>
+	  		<textarea onkeypress="textarea_onkey(event);" id="commform-text" cols=40 rows=10 name="txt"></textarea>
+	  		<br/>
+	  		<input type="hidden" size="3" name="pdf" value='{{pdf.id}}'/>
+	  		<input type="hidden" size="3" id="commform-x" name="x"/>
+	  		<input type="hidden" size="3" id="commform-y" name="y"/>
+	  		<input type="hidden" size="3" id="commform-img-id" name="img-id"/>
+	  		<input type="hidden" size="3" id="commform-id" name="id"/>
+	  		<input type="hidden" size="3" id="commform-action" name="action"/>
+	  		<input type="hidden" size="3" id="commform-action" name="scroll"/>
+		</form>
+		<!-- /Pridat korekturu / komentar !-->
 	</div>
 
 	{% for i in img_indexes %}
-	<div class='imgdiv'><img width='1021' height='1448' onclick='img_click(this,event)' id='img-{{i}}' src='/media/korektury/img/{{img_name}}-{{i}}.png'/></div><hr/>
+	<div class='imgdiv'>
+		<img width='1021' height='1448' 
+			onclick='img_click(this,event)' id='img-{{i}}' 
+			src='/media/korektury/img/{{img_name}}-{{i}}.png'/>
+	</div>
+	<hr/>
 	{% endfor %}
 
+	<!-- Smazat vsechny komentare !-->
 	<form method="post">
-	  {% csrf_token %}
-	  <input type='hidden' name='action' value='delall'/>
-	  <input type='submit' value='Smazat všechny komentáře'/>
-	  <input type='hidden' name='pdf' value='{{pdf.id}}'/>
-	  <input type='checkbox' name='yes'/> Souhlasím se smazáním všech kometářů
+		{% csrf_token %}
+		<input type='hidden' name='action' value='delall'/>
+		<input type='submit' value='Smazat všechny komentáře'/>
+		<input type='hidden' name='pdf' value='{{pdf.id}}'/>
+		<input type='checkbox' name='yes'/> Souhlasím se smazáním všech kometářů
 	</form>
+	<!-- /Smazat vsechny komentare !-->
 	<hr/>
-
-	Děkujeme opravovatelům: {% for autor,pocet in zasluhy.items %} {{autor}}({{pocet}}) {% endfor %}<hr>
-
-
-
-{% for o in opravy %}
-
-<div onclick='img_click(this,event)' id='op{{o.id}}-pointer' class='pointer{%if o.status = 'opraveno' %}-done{% endif %}'>
-</div>
-<div name='op{{o.id}}' id='op{{o.id}}' 
+	<p>
+	Děkujeme opravovatelům: {% for autor,pocet in zasluhy.items %} {{autor}}({{pocet}}) {% endfor %}</p>
+	<hr>
+
+	{% for o in opravy %}
+	<div onclick='img_click(this,event)'
+		id='op{{o.id}}-pointer'
+		class='pointer{%if o.status = 'opraveno' %}-done{% endif %}'>
+	</div>
+	<div name='op{{o.id}}' id='op{{o.id}}' 
 	    class='box{%if o.status = 'opraveno' %}-done{% endif %}' 
 	    onmouseover='box_onmouseover(this,{% if o.status = 'opraveno' %}1{% else %}0{% endif %})' 
 		onmouseout='box_onmouseout(this,{% if o.status = 'opraveno' %}1{% else %}0{% endif %})' >
-	  
-    <div class='corr-header'> 
-	<div class='author' id='op{{o.id}}-autor'>{{o.autor}}</div>
-	 <div class='float-right'>
-	  <form  action='' onsubmit='save_scroll(this)' method='POST'>
-	   {% csrf_token %}
-	   <input type='hidden' name="au" value="{{autor}}"/>
-	   <input type='hidden' name='pdf' value='{{pdf.id}}'>
-	   <input type='hidden' name='id' value='{{o.id}}'>
-	   <input type='hidden' name='scroll'>
-	   {% if o.komentare %}
-	   <button name='action' value='del' type='button'
-            title="Korekturu 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'>
-		   <img src="/static/korektury/imgs/delete.png"/>
-	   </button>
-	   {% endif %}
-	   
-	   {% if o.status = 'opraveno' %}
-	   <button type='submit' name='action' value='undone' title='Označ jako neopravené'>
-		   <img src="/static/korektury/imgs/undo.png"/>
-	   </button>
-	   {% else %}
-	   <button type='submit' name='action' value='done' title='Označ jako opravené'>
-		   <img src="/static/korektury/imgs/check.png"/>
-	   </button>
-	   {% endif %}
-	    
-       	   {% 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(this,"update");' title='Oprav opravu'>
-		   <img src="/static/korektury/imgs/edit.png"/>
-	   </button>
-	   {% endif %}
-	   <button type='button' onclick='box_edit(this, "comment");' title='Komentovat'>
-		   <img src="/static/korektury/imgs/comment.png"/>
-	   </button>
 
-	   <a href='#op{{o.id}}'><button type='button' title='Link na opravu'>
-			   <img src="/static/korektury/imgs/link.png"/>
-	   </button></a>
-	   <button><a href='#TODO'>
-			   <img title='Další oprava' src="/static/korektury/imgs/next.png"/>
-	   </a></button>
-	    
-	  </form>
-	 </div>
-	</div>
-	<div id='op{{o.id}}-text'>{{o.text}}</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='corr-header'> 
+			<div class='author' id='op{{o.id}}-autor'>{{o.autor}}</div>
+			<div class='float-right'>
+				<!-- Existujici korektura !-->
+	  			<form  action='' onsubmit='save_scroll(this)' method='POST'>
+	   				{% csrf_token %}
+	   				<input type='hidden' name="au" value="{{autor}}"/>
+	   				<input type='hidden' name='pdf' value='{{pdf.id}}'>
+	   				<input type='hidden' name='id' value='{{o.id}}'>
+	   				<input type='hidden' name='scroll'>
+	   				
+					{% if o.komentare %}
+	   				<button name='action' value='del' type='button'
+            			title="Korekturu 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'>
+						<img src="/static/korektury/imgs/delete.png"/>
+					</button>
+					{% endif %}
+					   
+					{% if o.status = 'opraveno' %}
+					<button type='submit' name='action' value='undone' title='Označ jako neopravené'>
+						<img src="/static/korektury/imgs/undo.png"/>
+					</button>
+					{% else %}
+					<button type='submit' name='action' value='done' title='Označ jako opravené'>
+						<img src="/static/korektury/imgs/check.png"/>
+					</button>
+					{% endif %}
+						
+					{% 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(this,"update");' title='Oprav opravu'>
+						<img src="/static/korektury/imgs/edit.png"/>
+					</button>
+					{% endif %}
+					<button type='button' onclick='box_edit(this, "comment");' title='Komentovat'>
+						<img src="/static/korektury/imgs/comment.png"/>
+					</button>
+				</form>
+				<!-- /Existujici korektura !-->
+				<button type='button' title='Link na opravu'>
+					<a href='#op{{o.id}}'>
+						<img src="/static/korektury/imgs/link.png"/>
+					</a>
+				</button>
+				<button>
+					<a href='#TODO'>
+						<img title='Další oprava' src="/static/korektury/imgs/next.png"/>
+					</a>
+				</button>
+			</div>
+		</div>
+		<div id='op{{o.id}}-text'>{{o.text}}</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='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>
+						{% csrf_token %}
+                    	<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>
                     </form>
-                    <button type='button' onclick='update_comment(this);' title='Uprav komentář'>
-						<img src="/static/korektury/imgs/edit.png"/></button>
-                  </div>
-              </div>
-	      <div id='kt{{k.id}}'>{{k.text}}</div>
-            </div>
-	{% endfor %}
-         
+					<!-- /Komentar !-->
+					<button type='button' onclick='update_comment(this);' title='Uprav komentář'>
+						<img src="/static/korektury/imgs/edit.png"/>
+					</button>
+				</div>
+			</div>
+			<div id='kt{{k.id}}'>{{k.text}}</div>
+		</div>
+		{% endfor %} 
 	</div>	
+	{% endfor %}
 
-
-{% endfor %}
-
-		<script>
-	  {% for o in opravy %}
+	<script>
+	{% for o in opravy %}
 		place_comments_one_div("img-{{o.strana}}", [["op{{o.id}}",{{o.x}},{{o.y}}]]);
-	  {% endfor %}
-	 
-		</script>
-
-
-		<form action='' onsubmit='save_scroll(this)' method='POST'>
-			{% csrf_token %}
-			{{ form_oprava.as_p }}
-			<input type='submit' value='Odeslat'/>
-		</form>
-	  {% if scroll %}
-		<script>
-			  window.scrollTo(0,{{scroll}});
-		</script>
-	  {% endif %}
-
-
+	{% endfor %}
+	{% if scroll %}
+		window.scrollTo(0,{{scroll}});
+	{% endif %}
+	</script>
 </body>
 </html>