diff --git a/korektury/templates/korektury/korekturovatko/__edit_komentar.html b/korektury/templates/korektury/korekturovatko/__edit_komentar.html
new file mode 100644
index 00000000..7e6462ba
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/__edit_komentar.html
@@ -0,0 +1,17 @@
+<div id="commform-div">
+    <form action='' onsubmit='save_scroll(this)' id="commform" method="POST">
+        {% csrf_token %}
+        <input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/>
+        <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" 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>
+</div>
diff --git a/korektury/templates/korektury/korekturovatko/__komentar.html b/korektury/templates/korektury/korekturovatko/__komentar.html
new file mode 100644
index 00000000..8e95374f
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/__komentar.html
@@ -0,0 +1,24 @@
+{% load static %}
+
+<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>
\ No newline at end of file
diff --git a/korektury/templates/korektury/korekturovatko/__oprava.html b/korektury/templates/korektury/korekturovatko/__oprava.html
new file mode 100644
index 00000000..d3b2f3fd
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/__oprava.html
@@ -0,0 +1,69 @@
+{% load static %}
+
+<div onclick='img_click(this,event)'
+     id='op{{o.id}}-pointer'
+     class='pointer {{o.status}}'>
+</div>
+<div name='op{{o.id}}' id='op{{o.id}}'
+     class='box {{o.status}}'
+     onmouseover='box_onmouseover(this)'
+     onmouseout='box_onmouseout(this)'>
+
+  <div class='corr-body' id='op{{o.id}}-body'>
+
+    {% for k in o.komentare %}
+      {% include "korektury/korekturovatko/__komentar.html" %}
+      <hr>
+    {% endfor %}
+  </div>
+  <div class='corr-header'>
+			<span class='float-right'>
+				<span id='op{{o.id}}-buttons'>
+	  			<form  action='' onsubmit='save_scroll(this)' method='POST'>
+	   				{% csrf_token %}
+	   				<input type='hidden' name='id' value='{{o.id}}'>
+	   				<input type='hidden' name='scroll'>
+	   				
+					<button style="display: none" type='submit' name='action' value='del' title='Smaž opravu'>
+            <img src="{% static "korektury/imgs/delete.png"%}"/>
+					</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"%}"/>
+					</button>
+            {% endif %}
+            {% if o.status != o.STATUS.OPRAVENO %}
+              <button type='submit' name='action' value='{{ o.STATUS.OPRAVENO }}' title='Označ jako opravené'>
+            <img src="{% static "korektury/imgs/check.png"%}"/>
+					</button>
+            {% endif %}
+            {% if o.status != o.STATUS.NENI_CHYBA %}
+              <button type='submit' name='action' value='{{ o.STATUS.NENI_CHYBA }}' title='Označ, že se nebude měnit'>
+            <img src="{% static "korektury/imgs/cross.png" %}"/>
+					</button>
+            {% endif %}
+            {% if o.status != o.STATUS.K_ZANESENI %}
+              <button type='submit' name='action' value='{{ o.STATUS.K_ZANESENI }}' title='Označ jako připraveno k zanesení'>
+            <img src="{% static "korektury/imgs/tex.png" %}"/>
+					</button>
+            {% endif %}
+				</form>
+
+          {% 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" %}"/>
+				</button>
+          {% else %}
+            <button type='button' onclick='box_edit("op{{o.id}}", "comment");' title='Komentovat'>
+          <img src="{% static "korektury/imgs/comment.png" %}"/>
+				</button>
+          {% endif %}
+
+				</span>
+				<button type='button' onclick='toggle_visibility("op{{o.id}}");' title='Skrýt/Zobrazit'>
+          <img id='op{{o.id}}-toggleimg' src="{% static "korektury/imgs/hide.png" %}"/>
+				</button>
+
+			</span>
+  </div>
+</div>
\ No newline at end of file
diff --git a/korektury/templates/korektury/korekturovatko/_main.html b/korektury/templates/korektury/korekturovatko/_main.html
new file mode 100644
index 00000000..66653d26
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/_main.html
@@ -0,0 +1,30 @@
+{% include "korektury/korekturovatko/__edit_komentar.html" %}
+
+{% 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_prefix}}-{{i}}.png'
+      alt='Strana {{ i|add:1 }}'
+    />
+  </div>
+
+  <hr/>
+{% endfor %}
+
+
+{% for o in opravy %}
+  {% include "korektury/korekturovatko/__oprava.html" %}
+{% endfor %}
+
+<script>
+  var comments = [
+    {% for s in opravy_strany %}
+      ["img-{{s.strana}}", [{% for o in s.op_id %}["op{{o.id}}",{{o.x}},{{o.y}}],{% endfor %}[]]],
+    {% endfor %}
+    []]
+  {% if scroll %}
+    window.scrollTo(0,{{scroll}});
+  {% endif %}
+</script>
diff --git a/korektury/templates/korektury/korekturovatko/_schovani_korektur.html b/korektury/templates/korektury/korekturovatko/_schovani_korektur.html
new file mode 100644
index 00000000..4d1ffd31
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/_schovani_korektur.html
@@ -0,0 +1,23 @@
+Zobrazit:
+<input type="checkbox"
+       id="k_oprave_checkbox"
+       name="k_oprave_checkbox"
+       onchange="toggle_corrections('k_oprave')" checked>
+<label for="k_oprave_checkbox">K opravě ({{k_oprave_cnt}})</label>
+<input type="checkbox"
+       id="opraveno_checkbox"
+       name="opraveno_checkbox"
+       onchange="toggle_corrections('opraveno')" checked>
+<label for="opraveno_checkbox">Opraveno ({{opraveno_cnt}})</label>
+<input type="checkbox"
+       id="neni_chyba_checkbox"
+       name="neni_chyba_checkbox"
+       onchange="toggle_corrections('neni_chyba')" checked>
+<label for="neni_chyba_checkbox">Není chyba ({{neni_chyba_cnt}})</label>
+<input type="checkbox"
+       id="k_zaneseni_checkbox"
+       name="k_zaneseni_checkbox"
+       onchange="toggle_corrections('k_zaneseni')" checked>
+<label for="k_zaneseni_checkbox">K zanesení ({{k_zaneseni_cnt}})</label>
+
+<hr/>
\ No newline at end of file
diff --git a/korektury/templates/korektury/korekturovatko/_zmena_stavu.html b/korektury/templates/korektury/korekturovatko/_zmena_stavu.html
new file mode 100644
index 00000000..e0415019
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/_zmena_stavu.html
@@ -0,0 +1,14 @@
+<h4>Změnit stav PDF:</h4>
+<i>Aktuální: {{pdf.status}}</i>
+<br>
+<form method="post">
+  {% csrf_token %}
+  <input type='hidden' name='action' value='set-state'/>
+  <input type="radio" name="state" value="{{ pdf.STATUS.PRIDAVANI }}" {% if pdf.status == pdf.STATUS.PRIDAVANI %} checked {% endif %}>Přidávání korektur
+  <br>
+  <input type="radio" name="state" value="{{ pdf.STATUS.ZANASENI }}" {% if pdf.status == pdf.STATUS.ZANASENI %} checked {% endif %}>Zanášení korektur
+  <br>
+  <input type="radio" name="state" value="{{ pdf.STATUS.ZASTARALE }}" {%	if pdf.status == pdf.STATUS.ZASTARALE %} checked {% endif %}>Zastaralé, nekorigovat
+  <br>
+  <input type='submit' value='Změnit stav PDF'/>
+</form>
diff --git a/korektury/templates/korektury/korekturovatko/htmlstrana.html b/korektury/templates/korektury/korekturovatko/htmlstrana.html
new file mode 100644
index 00000000..1f95769c
--- /dev/null
+++ b/korektury/templates/korektury/korekturovatko/htmlstrana.html
@@ -0,0 +1,44 @@
+{% load static %}
+
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link rel="stylesheet" title="opraf-css" type="text/css" media="screen, projection" href="{% static "korektury/opraf.css"%}" />
+  <link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
+  <script src="{% static "korektury/opraf.js"%}"></script>
+  <title>Korektury {{pdf.nazev}}</title>
+</head>
+<body class="{{ LOCAL_TEST_PROD }}web{% if pdf.status == 'zanaseni'%} comitting{% elif pdf.status == 'zastarale' %} deprecated{% endif %}" onload='place_comments()'>
+
+  <h1>Korektury {{pdf.nazev}}</h1>
+
+  {% if pdf.status == 'zanaseni' %} <h2> Probíhá zanášení korektur, zvažte, zda chcete přidávat nové </h2> {% endif %}
+  {% if pdf.status == 'zastarale' %} <h2> Toto PDF je již zastaralé, nepřidávejte nové korektury </h2> {% endif %}
+
+  <i>{{pdf.komentar}}</i>
+  <br>
+  <i>Klikni na chybu, napiš komentář</i>  |
+  <a href="{{pdf.pdf.url}}">stáhnout PDF (bez korektur)</a> |
+  <a href="../">seznam souborů</a> |
+  <a href="/admin/korektury/korekturovanepdf/">Spravovat PDF</a> |
+  <a href="../help">nápověda</a> |
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|
+  <a href="/">hlavní stránka</a> |
+  <a href="https://mam.mff.cuni.cz/wiki">wiki</a> |
+  <hr />
+  
+  {% include "korektury/korekturovatko/_schovani_korektur.html" %}
+  
+  {% include "korektury/korekturovatko/_main.html" %}
+
+  {% include "korektury/korekturovatko/_zmena_stavu.html" %}
+
+  <hr/>
+  <p>
+    Děkujeme opravovatelům:
+    {% for z in zasluhy %}
+      {{z.autor}} ({{z.pocet}}){% if not forloop.last %},{% endif %}
+    {% endfor %}</p>
+  <hr>
+</body>
+</html>
diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html
deleted file mode 100644
index 176e6fe6..00000000
--- a/korektury/templates/korektury/opraf.html
+++ /dev/null
@@ -1,208 +0,0 @@
-{% load static %}
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" title="opraf-css" type="text/css" media="screen, projection" href="{% static "korektury/opraf.css"%}" />
-    <link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
-  <script src="{% static "korektury/opraf.js"%}"></script>
-	<title>Korektury {{pdf.nazev}}</title>
-</head>
-<body class="{{ LOCAL_TEST_PROD }}web{% if pdf.status == 'zanaseni'%} comitting{% elif pdf.status == 'zastarale' %} deprecated{% endif %}" onload='place_comments()'>
-	<h1>Korektury {{pdf.nazev}}</h1>
-	{% if pdf.status == 'zanaseni' %} <h2> Probíhá zanášení korektur, zvažte, zda chcete přidávat nové </h2> {% endif %}
-	{% if pdf.status == 'zastarale' %} <h2> Toto PDF je již zastaralé, nepřidávejte nové korektury </h2> {% endif %}
-	<i>{{pdf.komentar}}</i>
-	<br>
-	<i>Klikni na chybu, napiš komentář</i>  |
-	<a href="{{pdf.pdf.url}}">stáhnout PDF (bez korektur)</a> |
-	<a href="../">seznam souborů</a> |
-	<a href="/admin/korektury/korekturovanepdf/">Spravovat PDF</a> |
-	<a href="../help">nápověda</a> |
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|
-	<a href="/">hlavní stránka</a> |
-	<a href="https://mam.mff.cuni.cz/wiki">wiki</a> |
-	<hr />
-	Zobrazit: 
-	<input type="checkbox" 
-		id="k_oprave_checkbox" 
-		name="k_oprave_checkbox" 
-		onchange="toggle_corrections('k_oprave')" checked>
-	<label for="k_oprave_checkbox">K opravě ({{k_oprave_cnt}})</label>
-	<input type="checkbox"
-		id="opraveno_checkbox"
-		name="opraveno_checkbox" 
-		onchange="toggle_corrections('opraveno')" checked>
-	<label for="opraveno_checkbox">Opraveno ({{opraveno_cnt}})</label>
-	<input type="checkbox"
-		id="neni_chyba_checkbox"
-		name="neni_chyba_checkbox"
-		onchange="toggle_corrections('neni_chyba')" checked>
-	<label for="neni_chyba_checkbox">Není chyba ({{neni_chyba_cnt}})</label>
-	<input type="checkbox"
-		id="k_zaneseni_checkbox"
-		name="k_zaneseni_checkbox"
-		onchange="toggle_corrections('k_zaneseni')" checked>
-	<label for="k_zaneseni_checkbox">K zanesení ({{k_zaneseni_cnt}})</label>
-
-	<hr/>
-
-	<div id="commform-div">
-		<!-- Pridat korekturu / komentar !-->
-		<form action='' onsubmit='save_scroll(this)' id="commform" method="POST">
-			{% csrf_token %}
-			<input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/>
-			<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" 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_prefix}}-{{i}}.png'/>
-	</div>
-	<hr/>
-	{% endfor %}
-
-	<h4>Změnit stav PDF:</h4>
-	<i>Aktuální: {{pdf.status}}</i>
-	<br>
-	<!-- Zmenit stav PDF !-->
-	<form method="post">
-		{% csrf_token %}
-		<input type='hidden' name='action' value='set-state'/>
-		<input type="radio" name="state" value="{{ pdf.STATUS.PRIDAVANI }}" {% if pdf.status == pdf.STATUS.PRIDAVANI %} checked {% endif %}>Přidávání korektur
-		<br>
-		<input type="radio" name="state" value="{{ pdf.STATUS.ZANASENI }}" {% if pdf.status == pdf.STATUS.ZANASENI %} checked {% endif %}>Zanášení korektur
-		<br>
-		<input type="radio" name="state" value="{{ pdf.STATUS.ZASTARALE }}" {%	if pdf.status == pdf.STATUS.ZASTARALE %} checked {% endif %}>Zastaralé, nekorigovat
-		<br>
-		<input type='submit' value='Změnit stav PDF'/>
-	</form>
-	
-	<!-- /Zmenit stav PDF !-->
-	<hr/>
-	<p>
-  Děkujeme opravovatelům:
-    {% for z in zasluhy %}
-      {{z.autor}} ({{z.pocet}}){% if not forloop.last %},{% endif %}
-    {% endfor %}</p>
-	<hr>
-
-	{% for o in opravy %}
-	<div onclick='img_click(this,event)'
-		id='op{{o.id}}-pointer'
-		class='pointer {{o.status}}'>
-	</div>
-	<div name='op{{o.id}}' id='op{{o.id}}' 
-	    class='box {{o.status}}' 
-	    onmouseover='box_onmouseover(this)' 
-	    onmouseout='box_onmouseout(this)'> 
-
-		<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 !-->
-	  			<form  action='' onsubmit='save_scroll(this)' method='POST'>
-	   				{% csrf_token %}
-	   				<input type='hidden' name='id' value='{{o.id}}'>
-	   				<input type='hidden' name='scroll'>
-	   				
-					<button style="display: none" type='submit' name='action' value='del' title='Smaž opravu'>
-            <img src="{% static "korektury/imgs/delete.png"%}"/>
-					</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"%}"/>
-					</button>
-					{% endif %}
-					{% if o.status != o.STATUS.OPRAVENO %}
-					<button type='submit' name='action' value='{{ o.STATUS.OPRAVENO }}' title='Označ jako opravené'>
-            <img src="{% static "korektury/imgs/check.png"%}"/>
-					</button>
-					{% endif %}
-					{% if o.status != o.STATUS.NENI_CHYBA %} 
-					<button type='submit' name='action' value='{{ o.STATUS.NENI_CHYBA }}' title='Označ, že se nebude měnit'>
-            <img src="{% static "korektury/imgs/cross.png" %}"/>
-					</button>
-					{% endif %}
-					{% if o.status != o.STATUS.K_ZANESENI %} 
-					<button type='submit' name='action' value='{{ o.STATUS.K_ZANESENI }}' title='Označ jako připraveno k zanesení'>
-            <img src="{% static "korektury/imgs/tex.png" %}"/>
-					</button>
-					{% endif %}
-				</form>
-				<!-- /Existujici korektura !-->
-						
-				{% 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" %}"/>
-				</button>
-				{% else %}
-				<button type='button' onclick='box_edit("op{{o.id}}", "comment");' title='Komentovat'>
-          <img src="{% static "korektury/imgs/comment.png" %}"/>
-				</button>
-				{% endif %}
-
-				</span>
-				<button type='button' onclick='toggle_visibility("op{{o.id}}");' title='Skrýt/Zobrazit'>
-          <img id='op{{o.id}}-toggleimg' src="{% static "korektury/imgs/hide.png" %}"/>
-				</button>
-
-			</span>
-		</div>
-	</div>	
-	{% endfor %}
-
-	<script>
-	var comments = [
-	{% for s in opravy_strany %}
-		["img-{{s.strana}}", [{% for o in s.op_id %}["op{{o.id}}",{{o.x}},{{o.y}}],{% endfor %}[]]],
-	{% endfor %}
-	[]]
-	{% if scroll %}
-		window.scrollTo(0,{{scroll}});
-	{% endif %}
-	</script>
-</body>
-</html>
diff --git a/korektury/views.py b/korektury/views.py
index 93cffb7e..f077f297 100644
--- a/korektury/views.py
+++ b/korektury/views.py
@@ -52,7 +52,7 @@ class KorekturySeskupeneListView(KorekturyAktualniListView):
 ### Korektury
 class KorekturyView(generic.TemplateView):
 	model = Oprava
-	template_name = 'korektury/opraf.html'
+	template_name = 'korektury/korekturovatko/htmlstrana.html'
 
 	def setup(self, request, *args, **kwargs):
 		super().setup(request, *args, **kwargs)
@@ -121,7 +121,7 @@ class KorekturyView(generic.TemplateView):
 		context = self.get_context_data()
 		context['scroll'] = scroll
 		context['autor'] = autor
-		return render(request, 'korektury/opraf.html',context)
+		return render(request, 'korektury/korekturovatko/htmlstrana.html', context)
 
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)