diff --git a/lib/runosaari_web/templates/performance/admin.html.eex b/lib/runosaari_web/templates/performance/admin.html.eex
index cf7f422..e325457 100644
--- a/lib/runosaari_web/templates/performance/admin.html.eex
+++ b/lib/runosaari_web/templates/performance/admin.html.eex
@@ -1,28 +1,30 @@
-<h1>HALLINTA</h1>
+<section class="main">
+  <h1>HALLINTA - Näytökset</h1>
 
-<table>
-  <thead>
-    <tr>
-      <th>Nimi</th>
-      <th>Seloste</th>
+  <table>
+    <thead>
+      <tr>
+        <th>Nimi</th>
+        <th>Seloste</th>
 
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-  <%= for performance <- @performances do %>
-    <tr>
-      <td><%= performance.name %></td>
-      <td><%= performance.desc %></td>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <%= for performance <- @performances do %>
+      <tr>
+        <td><%= performance.name %></td>
+        <td><%= performance.desc %></td>
 
-      <td>
-        <span><%= link "Lisätietoja", to: Routes.admin_performance_path(@conn, :show, performance) %></span>
-        <span><%= link "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, performance) %></span>
-        <span><%= link "Poista", to: Routes.admin_performance_path(@conn, :delete, performance), method: :delete, data: [confirm: "Haluatko poistaa näytöksen #{performance.name}?"] %></span>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+        <td>
+          <span><%= link "Lisätietoja", to: Routes.admin_performance_path(@conn, :show, performance) %></span>
+          <span><%= link "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, performance) %></span>
+          <span><%= link "Poista", to: Routes.admin_performance_path(@conn, :delete, performance), method: :delete, data: [confirm: "Haluatko poistaa näytöksen #{performance.name}?"] %></span>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-<span><%= link "Uusi näytös", to: Routes.admin_performance_path(@conn, :new) %></span>
+  <span><%= link "Uusi näytös", to: Routes.admin_performance_path(@conn, :new) %></span>
+</section>
diff --git a/lib/runosaari_web/templates/performance/show.html.eex b/lib/runosaari_web/templates/performance/show.html.eex
index d7cf8e5..edcfad8 100644
--- a/lib/runosaari_web/templates/performance/show.html.eex
+++ b/lib/runosaari_web/templates/performance/show.html.eex
@@ -1,18 +1,20 @@
-<h1>Näytös</h1>
+<section class="main">
+  <h1>Näytöksen tiedot</h1>
 
-<ul>
+  <ul>
 
-  <li>
-    <strong>Nimi:</strong>
-    <%= @performance.name %>
-  </li>
+    <li>
+      <strong>Nimi:</strong>
+      <%= @performance.name %>
+    </li>
 
-  <li>
-    <strong>Seloste:</strong>
-    <%= @performance.desc %>
-  </li>
+    <li>
+      <strong>Seloste:</strong>
+      <%= @performance.desc %>
+    </li>
 
-</ul>
+  </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 "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, @performance) %></span>
+  <span><%= link "Takaisin", to: Routes.performance_path(@conn, :index) %></span>
+</section>
diff --git a/lib/runosaari_web/templates/performer/admin.html.eex b/lib/runosaari_web/templates/performer/admin.html.eex
index d715ee2..f5db61d 100644
--- a/lib/runosaari_web/templates/performer/admin.html.eex
+++ b/lib/runosaari_web/templates/performer/admin.html.eex
@@ -1,36 +1,34 @@
-<h1>HALLINTA</h1>
+<section class="main">
+  <h1>HALLINTA - Esiintyjät</h1>
 
-<table>
-  <thead>
-    <tr>
-      <th>Etunimi</th>
-      <th>Sukunimi</th>
-      <th>Sähköposti</th>
-      <th>Puhelin numero</th>
-      <th>Vahvistettu</th>
-      <th>Seloste</th>
+  <table>
+    <thead>
+      <tr>
+        <th>Etunimi</th>
+        <th>Sukunimi</th>
+        <th>Sähköposti</th>
+        <th>Puhelin numero</th>
+        <th>Vahvistettu</th>
+      </tr>
+    </thead>
+    <tbody>
+    <%= for performer <- @performers do %>
+        <tr>
+          <td><%= performer.fname %></td>
+          <td><%= performer.lname %></td>
+          <td><%= performer.email %></td>
+          <td><%= performer.tel %></td>
+          <td><%= performer.confirmed %></td>
 
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-<%= for performer <- @performers do %>
-    <tr>
-      <td><%= performer.fname %></td>
-      <td><%= performer.lname %></td>
-      <td><%= performer.email %></td>
-      <td><%= performer.tel %></td>
-      <td><%= performer.confirmed %></td>
-      <td><%= performer.desc %></td>
+          <td>
+            <span><%= link "Lisätietoja", to: Routes.admin_performer_path(@conn, :show, performer) %></span>
+            <span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %></span>
+            <span><%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.fname} #{performer.lname}?"] %></span>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
 
-      <td>
-        <span><%= link "Lisätietoja", to: Routes.admin_performer_path(@conn, :show, performer) %></span>
-        <span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %></span>
-        <span><%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.fname} #{performer.lname}?"] %></span>
-      </td>
-    </tr>
-<% end %>
-  </tbody>
-</table>
-
-<span><%= link "Uusi esiintyjä", to: Routes.admin_performer_path(@conn, :new) %></span>
+  <span><%= link "Uusi esiintyjä", to: Routes.admin_performer_path(@conn, :new) %></span>
+</section>
diff --git a/lib/runosaari_web/templates/performer/show.html.eex b/lib/runosaari_web/templates/performer/show.html.eex
index 5cd6b71..edf3ae5 100644
--- a/lib/runosaari_web/templates/performer/show.html.eex
+++ b/lib/runosaari_web/templates/performer/show.html.eex
@@ -1,63 +1,65 @@
-<h1>Esiintyjän tiedot</h1>
+<section class="main">
+  <h1>Esiintyjän tiedot</h1>
 
-<ul>
+  <ul>
 
-  <li>
-    <strong>Etunimi:</strong>
-    <%= @performer.fname %>
-  </li>
+    <li>
+      <strong>Etunimi:</strong>
+      <%= @performer.fname %>
+    </li>
 
-  <li>
-    <strong>Sukunimi:</strong>
-    <%= @performer.lname %>
-  </li>
+    <li>
+      <strong>Sukunimi:</strong>
+      <%= @performer.lname %>
+    </li>
 
-  <li>
-    <strong>Sähköposti:</strong>
-    <%= @performer.email %>
-  </li>
+    <li>
+      <strong>Sähköposti:</strong>
+      <%= @performer.email %>
+    </li>
 
-  <li>
-    <strong>Puhelin numero:</strong>
-    <%= @performer.tel %>
-  </li>
+    <li>
+      <strong>Puhelin numero:</strong>
+      <%= @performer.tel %>
+    </li>
 
-  <li>
-    <strong>Vahvistettu:</strong>
-    <%= @performer.confirmed %>
-  </li>
+    <li>
+      <strong>Vahvistettu:</strong>
+      <%= @performer.confirmed %>
+    </li>
 
-  <li>
-    <strong>Seloste:</strong>
-    <%= @performer.desc %>
-  </li>
+    <li>
+      <strong>Seloste:</strong>
+      <%= @performer.desc %>
+    </li>
 
-  <li>
-    <strong>Torstai:</strong>
-    <%= @performer.date1 %>
-  </li>
+    <li>
+      <strong>Torstai:</strong>
+      <%= @performer.date1 %>
+    </li>
 
-  <li>
-    <strong>Perjantai:</strong>
-    <%= @performer.date2 %>
-  </li>
+    <li>
+      <strong>Perjantai:</strong>
+      <%= @performer.date2 %>
+    </li>
 
-  <li>
-    <strong>Lauantai:</strong>
-    <%= @performer.date3 %>
-  </li>
+    <li>
+      <strong>Lauantai:</strong>
+      <%= @performer.date3 %>
+    </li>
 
-  <li>
-    <strong>Bussikuljetus:</strong>
-    <%= @performer.bus %>
-  </li>
+    <li>
+      <strong>Bussikuljetus:</strong>
+      <%= @performer.bus %>
+    </li>
 
-  <li>
-    <strong>Majoilus:</strong>
-    <%= @performer.accom %>
-  </li>
+    <li>
+      <strong>Majoilus:</strong>
+      <%= @performer.accom %>
+    </li>
 
-</ul>
+  </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 "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, @performer) %></span>
+  <span><%= link "Takaisin", to: Routes.performer_path(@conn, :index) %></span>
+</section>
diff --git a/lib/runosaari_web/templates/visitor/edit.html.eex b/lib/runosaari_web/templates/visitor/edit.html.eex
index 3d7ebb8..e2f229e 100644
--- a/lib/runosaari_web/templates/visitor/edit.html.eex
+++ b/lib/runosaari_web/templates/visitor/edit.html.eex
@@ -1,5 +1,5 @@
-<h1>Edit Visitor</h1>
+<h1>Muokkaa osallistujan tietoja</h1>
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_visitor_path(@conn, :update, @visitor)) %>
 
-<span><%= link "Back", to: Routes.admin_visitor_path(@conn, :index) %></span>
+<span><%= link "Takaisin", to: Routes.admin_visitor_path(@conn, :index) %></span>
diff --git a/lib/runosaari_web/templates/visitor/index.html.eex b/lib/runosaari_web/templates/visitor/index.html.eex
index 4e4bb57..6286715 100644
--- a/lib/runosaari_web/templates/visitor/index.html.eex
+++ b/lib/runosaari_web/templates/visitor/index.html.eex
@@ -1,42 +1,42 @@
-<h1>Listing Visitors</h1>
+<section class="main">
+  <h1>Osallistujat</h1>
 
-<table>
-  <thead>
-    <tr>
-      <th>Fname</th>
-      <th>Lname</th>
-      <th>Email</th>
-      <th>Tel</th>
-      <th>Date1</th>
-      <th>Date2</th>
-      <th>Date3</th>
-      <th>Bus</th>
-      <th>Accom</th>
+  <table>
+    <thead>
+      <tr>
+        <th>Etunimi</th>
+        <th>Sukunimi</th>
+        <th>Sähköposti</th>
+        <th>Puhelinnumero</th>
+        <th>Torstai</th>
+        <th>Perjantai</th>
+        <th>Lauantai</th>
+        <th>Bussi</th>
+        <th>Majoitus</th>
 
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-<%= for visitor <- @visitors do %>
-    <tr>
-      <td><%= visitor.fname %></td>
-      <td><%= visitor.lname %></td>
-      <td><%= visitor.email %></td>
-      <td><%= visitor.tel %></td>
-      <td><%= visitor.date1 %></td>
-      <td><%= visitor.date2 %></td>
-      <td><%= visitor.date3 %></td>
-      <td><%= visitor.bus %></td>
-      <td><%= visitor.accom %></td>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <%= for visitor <- @visitors do %>
+        <tr>
+          <td><%= visitor.fname %></td>
+          <td><%= visitor.lname %></td>
+          <td><%= visitor.email %></td>
+          <td><%= visitor.tel %></td>
+          <td><%= visitor.date1 %></td>
+          <td><%= visitor.date2 %></td>
+          <td><%= visitor.date3 %></td>
+          <td><%= visitor.bus %></td>
+          <td><%= visitor.accom %></td>
 
-      <td>
-        <span><%= link "Show", to: Routes.admin_visitor_path(@conn, :show, visitor) %></span>
-        <span><%= link "Edit", to: Routes.admin_visitor_path(@conn, :edit, visitor) %></span>
-        <span><%= link "Delete", to: Routes.admin_visitor_path(@conn, :delete, visitor), method: :delete, data: [confirm: "Are you sure?"] %></span>
-      </td>
-    </tr>
-<% end %>
-  </tbody>
-</table>
-
-<span><%= link "New Visitor", to: Routes.visitor_path(@conn, :new) %></span>
+          <td>
+            <span><%= link "Lisätietoja", to: Routes.admin_visitor_path(@conn, :show, visitor) %></span>
+            <span><%= link "Muokkaa", to: Routes.admin_visitor_path(@conn, :edit, visitor) %></span>
+            <span><%= link "Poista", to: Routes.admin_visitor_path(@conn, :delete, visitor), method: :delete, data: [confirm: "Oletko varma?"] %></span>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</section>
diff --git a/lib/runosaari_web/templates/visitor/new.html.eex b/lib/runosaari_web/templates/visitor/new.html.eex
index 9179466..3667961 100644
--- a/lib/runosaari_web/templates/visitor/new.html.eex
+++ b/lib/runosaari_web/templates/visitor/new.html.eex
@@ -1,5 +1,5 @@
 <section class="main">
-    <h1 id="registration-start">Ilmoittaudu vierailijaksi</h1>
+    <h1 id="registration-start">Ilmoittaudu</h1>
 
     <%= render "form.html", Map.put(assigns, :action, Routes.visitor_path(@conn, :create)) %>
 </section>
diff --git a/lib/runosaari_web/templates/visitor/show.html.eex b/lib/runosaari_web/templates/visitor/show.html.eex
index f09055f..abf2256 100644
--- a/lib/runosaari_web/templates/visitor/show.html.eex
+++ b/lib/runosaari_web/templates/visitor/show.html.eex
@@ -1,53 +1,55 @@
-<h1>Show Visitor</h1>
+<section class="main">
+  <h1>Osallistujan tiedot</h1>
 
-<ul>
+  <ul>
 
-  <li>
-    <strong>Fname:</strong>
-    <%= @visitor.fname %>
-  </li>
+    <li>
+      <strong>Etunimi:</strong>
+      <%= @visitor.fname %>
+    </li>
 
-  <li>
-    <strong>Lname:</strong>
-    <%= @visitor.lname %>
-  </li>
+    <li>
+      <strong>Sukunimi:</strong>
+      <%= @visitor.lname %>
+    </li>
 
-  <li>
-    <strong>Email:</strong>
-    <%= @visitor.email %>
-  </li>
+    <li>
+      <strong>Sähköposti:</strong>
+      <%= @visitor.email %>
+    </li>
 
-  <li>
-    <strong>Tel:</strong>
-    <%= @visitor.tel %>
-  </li>
+    <li>
+      <strong>Puhelinnumero:</strong>
+      <%= @visitor.tel %>
+    </li>
 
-  <li>
-    <strong>Date1:</strong>
-    <%= @visitor.date1 %>
-  </li>
+    <li>
+      <strong>Torstai 22.7.:</strong>
+      <%= @visitor.date1 %>
+    </li>
 
-  <li>
-    <strong>Date2:</strong>
-    <%= @visitor.date2 %>
-  </li>
+    <li>
+      <strong>Perjantai 23.7.:</strong>
+      <%= @visitor.date2 %>
+    </li>
 
-  <li>
-    <strong>Date3:</strong>
-    <%= @visitor.date3 %>
-  </li>
+    <li>
+      <strong>Lauantai 24.7.:</strong>
+      <%= @visitor.date3 %>
+    </li>
 
-  <li>
-    <strong>Bus:</strong>
-    <%= @visitor.bus %>
-  </li>
+    <li>
+      <strong>Bus:</strong>
+      <%= @visitor.bus %>
+    </li>
 
-  <li>
-    <strong>Accom:</strong>
-    <%= @visitor.accom %>
-  </li>
+    <li>
+      <strong>Accom:</strong>
+      <%= @visitor.accom %>
+    </li>
 
-</ul>
+  </ul>
 
-<span><%= link "Edit", to: Routes.admin_visitor_path(@conn, :edit, @visitor) %></span>
-<span><%= link "Back", to: Routes.admin_visitor_path(@conn, :index) %></span>
+  <span><%= link "Muokkaa", to: Routes.admin_visitor_path(@conn, :edit, @visitor) %></span>
+  <span><%= link "Takaisin", to: Routes.admin_visitor_path(@conn, :index) %></span>
+</section>