diff --git a/lib/runosaari_web/templates/index/edit.html.eex b/lib/runosaari_web/templates/index/edit.html.eex
index f9be3ae..8463c1d 100644
--- a/lib/runosaari_web/templates/index/edit.html.eex
+++ b/lib/runosaari_web/templates/index/edit.html.eex
@@ -2,4 +2,4 @@
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_index_path(@conn, :update, @index)) %>
 
-<span><%= link "Takaisin", to: Routes.index_path(@conn, :index) %></span>
+<span><%= link "Takaisin", to: Routes.admin_index_path(@conn, :admin) %></span>
diff --git a/lib/runosaari_web/templates/index/new.html.eex b/lib/runosaari_web/templates/index/new.html.eex
index 08295a8..331c962 100644
--- a/lib/runosaari_web/templates/index/new.html.eex
+++ b/lib/runosaari_web/templates/index/new.html.eex
@@ -3,5 +3,5 @@
 
     <%= render "form.html", Map.put(assigns, :action, Routes.admin_index_path(@conn, :create)) %>
 
-    <span><%= link "Takaisin", to: Routes.index_path(@conn, :index) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_index_path(@conn, :admin) %></span>
 </section>
diff --git a/lib/runosaari_web/templates/index/show.html.eex b/lib/runosaari_web/templates/index/show.html.eex
index 8678749..4b88ba1 100644
--- a/lib/runosaari_web/templates/index/show.html.eex
+++ b/lib/runosaari_web/templates/index/show.html.eex
@@ -16,5 +16,5 @@
   </ul>
 
   <span><%= link "Muokkaa", to: Routes.admin_index_path(@conn, :edit, @index) %></span>
-  <span><%= link "Takaisin", to: Routes.index_path(@conn, :index) %></span>
+  <span><%= link "Takaisin", to: Routes.admin_index_path(@conn, :admin) %></span>
 </section>
diff --git a/lib/runosaari_web/templates/performance/edit.html.eex b/lib/runosaari_web/templates/performance/edit.html.eex
index 7eb54ef..de5d1ce 100644
--- a/lib/runosaari_web/templates/performance/edit.html.eex
+++ b/lib/runosaari_web/templates/performance/edit.html.eex
@@ -2,4 +2,4 @@
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_performance_path(@conn, :update, @performance)) %>
 
-<span><%= link "Takaisin", to: Routes.performance_path(@conn, :index) %></span>
+<span><%= link "Takaisin", to: Routes.admin_performance_path(@conn, :admin) %></span>
diff --git a/lib/runosaari_web/templates/performance/new.html.eex b/lib/runosaari_web/templates/performance/new.html.eex
index bc764a3..8c0edfd 100644
--- a/lib/runosaari_web/templates/performance/new.html.eex
+++ b/lib/runosaari_web/templates/performance/new.html.eex
@@ -1,5 +1,7 @@
-<h1>Luo näytös</h1>
+<section class="main">
+    <h1>Luo näytös</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_performance_path(@conn, :create)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_performance_path(@conn, :create)) %>
 
-<span><%= link "Takaisin", to: Routes.performance_path(@conn, :index) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_performance_path(@conn, :admin) %></span>
+</section>
diff --git a/lib/runosaari_web/templates/performance/show.html.eex b/lib/runosaari_web/templates/performance/show.html.eex
index edcfad8..adcd38f 100644
--- a/lib/runosaari_web/templates/performance/show.html.eex
+++ b/lib/runosaari_web/templates/performance/show.html.eex
@@ -16,5 +16,5 @@
   </ul>
 
   <span><%= link "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, @performance) %></span>
-  <span><%= link "Takaisin", to: Routes.performance_path(@conn, :index) %></span>
+  <span><%= link "Takaisin", to: Routes.admin_performance_path(@conn, :admin) %></span>
 </section>
diff --git a/lib/runosaari_web/templates/performer/edit.html.eex b/lib/runosaari_web/templates/performer/edit.html.eex
index 96b405a..dc534ce 100644
--- a/lib/runosaari_web/templates/performer/edit.html.eex
+++ b/lib/runosaari_web/templates/performer/edit.html.eex
@@ -2,4 +2,4 @@
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :update, @performer)) %>
 
-<span><%= link "Takaisin", to: Routes.performer_path(@conn, :index) %></span>
+<span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
diff --git a/lib/runosaari_web/templates/performer/new.html.eex b/lib/runosaari_web/templates/performer/new.html.eex
index 424c19f..09939e7 100644
--- a/lib/runosaari_web/templates/performer/new.html.eex
+++ b/lib/runosaari_web/templates/performer/new.html.eex
@@ -2,4 +2,6 @@
     <h1>Luo esiintyjä</h1>
 
     <%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :create)) %>
+
+    <span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
 </section>
diff --git a/lib/runosaari_web/templates/performer/show.html.eex b/lib/runosaari_web/templates/performer/show.html.eex
index 7723f4a..b6235d5 100644
--- a/lib/runosaari_web/templates/performer/show.html.eex
+++ b/lib/runosaari_web/templates/performer/show.html.eex
@@ -26,5 +26,5 @@
   </ul>
 
   <span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, @performer) %></span>
-  <span><%= link "Takaisin", to: Routes.performer_path(@conn, :index) %></span>
+  <span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
 </section>