diff --git a/lib/runosaari_web/templates/performer/admin.html.eex b/lib/runosaari_web/templates/performer/admin.html.eex
index 061a942..83d9f56 100644
--- a/lib/runosaari_web/templates/performer/admin.html.eex
+++ b/lib/runosaari_web/templates/performer/admin.html.eex
@@ -3,12 +3,12 @@
 <table>
   <thead>
     <tr>
-      <th>Fname</th>
-      <th>Lname</th>
-      <th>Email</th>
-      <th>Tel</th>
-      <th>Confirmed</th>
-      <th>Notes</th>
+      <th>Etunimi</th>
+      <th>Sukunimi</th>
+      <th>Sähköposti</th>
+      <th>Puhelin numero</th>
+      <th>Vahvistettu</th>
+      <th>Seloste</th>
 
       <th></th>
     </tr>
@@ -24,13 +24,13 @@
       <td><%= performer.notes %></td>
 
       <td>
-        <span><%= link "Show", to: Routes.performer_path(@conn, :show, performer) %></span>
-        <span><%= link "Edit", to: Routes.admin_performer_path(@conn, :edit, performer) %></span>
-        <span><%= link "Delete", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Are you sure?"] %></span>
+        <span><%= link "Näytä", to: Routes.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: "Are you sure?"] %></span>
       </td>
     </tr>
 <% end %>
   </tbody>
 </table>
 
-<span><%= link "New Performance", to: Routes.admin_performance_path(@conn, :new) %></span>
+<span><%= link "Uusi esiintyjä", to: Routes.admin_performer_path(@conn, :new) %></span>
diff --git a/lib/runosaari_web/templates/performer/index.html.eex b/lib/runosaari_web/templates/performer/index.html.eex
index 9c0876e..c31f250 100644
--- a/lib/runosaari_web/templates/performer/index.html.eex
+++ b/lib/runosaari_web/templates/performer/index.html.eex
@@ -1,29 +1,12 @@
-<h1>Listing Performers</h1>
+<h1>Esiintyjät</h1>
 
-<table>
-  <thead>
-    <tr>
-      <th>Fname</th>
-      <th>Lname</th>
-      <th>Email</th>
-      <th>Tel</th>
-      <th>Confirmed</th>
-      <th>Notes</th>
-
-      <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.notes %></td>
-    </tr>
+  <%= if performer.confirmed == true do %>
+    <article>
+          <h2><%= performer.fname %> <%= performer.lname %></h2>
+          <p><%= performer.notes %></p>
+    </article>
+  <% end %>
 <% end %>
-  </tbody>
-</table>
+
 <%= link "Hallinta", to: Routes.admin_performer_path(@conn, :admin) %>