diff --git a/lib/runosaari/registration/visitor.ex b/lib/runosaari/registration/visitor.ex
index a699e93..50c55ac 100644
--- a/lib/runosaari/registration/visitor.ex
+++ b/lib/runosaari/registration/visitor.ex
@@ -3,15 +3,15 @@ defmodule Runosaari.Registration.Visitor do
   import Ecto.Changeset
 
   schema "visitors" do
-    field :accom, :boolean, default: false
-    field :shared, :boolean, default: false
+    field :fname, :string
+    field :lname, :string
+    field :email, :string
+    field :tel, :string
     field :date1, :boolean, default: false
     field :date2, :boolean, default: false
     field :date3, :boolean, default: false
-    field :email, :string
-    field :fname, :string
-    field :lname, :string
-    field :tel, :string
+    field :accom, :boolean, default: false
+    field :shared, :boolean, default: false
 
     timestamps()
   end
diff --git a/lib/runosaari_web/controllers/performer_controller.ex b/lib/runosaari_web/controllers/performer_controller.ex
index fba9a22..35d7158 100644
--- a/lib/runosaari_web/controllers/performer_controller.ex
+++ b/lib/runosaari_web/controllers/performer_controller.ex
@@ -27,7 +27,7 @@ defmodule RunosaariWeb.PerformerController do
           :info,
           "Kiitokset ilmoittautumisestasi! Osallistumisesi tulee julkiseksi kun tapahtuman järjestäjät vahvistavat sen."
         )
-        |> redirect(to: Routes.performer_path(conn, :index))
+        |> redirect(to: Routes.admin_performer_path(conn, :admin))
 
       {:error, %Ecto.Changeset{} = changeset} ->
         render(conn, "new.html", changeset: changeset)
diff --git a/lib/runosaari_web/templates/visitor/confirmation.html.eex b/lib/runosaari_web/templates/visitor/confirmation.html.eex
index ba64181..bc240f7 100644
--- a/lib/runosaari_web/templates/visitor/confirmation.html.eex
+++ b/lib/runosaari_web/templates/visitor/confirmation.html.eex
@@ -1,5 +1,5 @@
 <section class="main">
-    <h2>Ilmoittautumisesi on rekisteröity. </h2>
+    <h2>Ilmoittautumisesi on rekisteröity.</h2>
     <h1>Tervetuloa mukaan!</h1>
     <h3>Tapahtuman järjestäjät ovat teihin yhteydessä sähköpostilla tarpeen mukaan.</h3>
 </section>
diff --git a/lib/runosaari_web/templates/visitor/index.html.eex b/lib/runosaari_web/templates/visitor/index.html.eex
index f3f70a4..bdefabb 100644
--- a/lib/runosaari_web/templates/visitor/index.html.eex
+++ b/lib/runosaari_web/templates/visitor/index.html.eex
@@ -1,5 +1,5 @@
 <section class="main">
-  <h1>Osallistujat</h1>
+  <h1>HALLINTA - Osallistujat</h1>
 
   <table>
     <thead>
diff --git a/test/runosaari/registration_test.exs b/test/runosaari/registration_test.exs
index 375a478..eff1d39 100644
--- a/test/runosaari/registration_test.exs
+++ b/test/runosaari/registration_test.exs
@@ -6,48 +6,23 @@ defmodule Runosaari.RegistrationTest do
   describe "performers" do
     alias Runosaari.Registration.Performer
 
-    @valid_attrs %{
-      confirmed: true,
-      email: "some email",
-      fname: "some fname",
-      lname: "some lname",
-      tel: "some tel",
-      desc: "some desc",
-      date1: true,
-      date2: true,
-      date3: true,
-      bus: true,
-      accom: true,
+    @create_attrs %{
+      name: "some name",
+      desc: "some description",
+      confirmed: false,
       seqnum: 1
     }
+
     @update_attrs %{
-      confirmed: false,
-      email: "some updated email",
-      fname: "some updated fname",
-      lname: "some updated lname",
-      tel: "some updated tel",
-      desc: "some updated desc",
-      date1: true,
-      date2: true,
-      date3: true,
-      bus: true,
-      accom: true,
+      name: "some updated name",
+      desc: "some updated description",
+      confirmed: true,
       seqnum: 2
     }
-    @invalid_attrs %{
-      confirmed: nil,
-      email: nil,
-      fname: nil,
-      lname: nil,
-      tel: nil,
-      desc: nil,
-      date1: nil,
-      date2: nil,
-      date3: nil,
-      bus: nil,
-      accom: nil,
-      seqnum: nil
-    }
+
+    @valid_attrs %{name: "some name", desc: "some description", confirmed: false, seqnum: 1}
+
+    @invalid_attrs %{name: nil, desc: nil, confirmed: nil, seqnum: nil}
 
     def performer_fixture(attrs \\ %{}) do
       {:ok, performer} =
@@ -70,17 +45,9 @@ defmodule Runosaari.RegistrationTest do
 
     test "create_performer/1 with valid data creates a performer" do
       assert {:ok, %Performer{} = performer} = Registration.create_performer(@valid_attrs)
-      assert performer.confirmed == true
-      assert performer.email == "some email"
-      assert performer.fname == "some fname"
-      assert performer.lname == "some lname"
-      assert performer.tel == "some tel"
-      assert performer.desc == "some desc"
-      assert performer.date1 == true
-      assert performer.date2 == true
-      assert performer.date3 == true
-      assert performer.bus == true
-      assert performer.accom == true
+      assert performer.name == "some name"
+      assert performer.desc == "some description"
+      assert performer.confirmed == false
       assert performer.seqnum == 1
     end
 
@@ -94,17 +61,9 @@ defmodule Runosaari.RegistrationTest do
       assert {:ok, %Performer{} = performer} =
                Registration.update_performer(performer, @update_attrs)
 
-      assert performer.confirmed == false
-      assert performer.email == "some updated email"
-      assert performer.fname == "some updated fname"
-      assert performer.lname == "some updated lname"
-      assert performer.tel == "some updated tel"
-      assert performer.desc == "some updated desc"
-      assert performer.date1 == true
-      assert performer.date2 == true
-      assert performer.date3 == true
-      assert performer.bus == true
-      assert performer.accom == true
+      assert performer.name == "some updated name"
+      assert performer.desc == "some updated description"
+      assert performer.confirmed == true
       assert performer.seqnum == 2
     end
 
diff --git a/test/runosaari/schedule_test.exs b/test/runosaari/schedule_test.exs
index 77e803a..c3a5fb9 100644
--- a/test/runosaari/schedule_test.exs
+++ b/test/runosaari/schedule_test.exs
@@ -6,19 +6,21 @@ defmodule Runosaari.ScheduleTest do
   describe "performances" do
     alias Runosaari.Schedule.Performance
 
-    @valid_attrs %{
-      description: "some description",
-      notes: "some notes",
-      time: ~N[2010-04-17 14:00:00],
+    @create_attrs %{
+      name: "some name",
+      desc: "some description",
       seqnum: 1
     }
+
     @update_attrs %{
-      description: "some updated description",
-      notes: "some updated notes",
-      time: ~N[2011-05-18 15:01:01],
+      name: "some updated name",
+      desc: "some updated description",
       seqnum: 2
     }
-    @invalid_attrs %{description: nil, notes: nil, time: nil, seqnum: nil}
+
+    @valid_attrs %{name: "some name", desc: "some description", seqnum: 1}
+
+    @invalid_attrs %{name: nil, desc: nil, seqnum: nil}
 
     def performance_fixture(attrs \\ %{}) do
       {:ok, performance} =
@@ -41,9 +43,8 @@ defmodule Runosaari.ScheduleTest do
 
     test "create_performance/1 with valid data creates a performance" do
       assert {:ok, %Performance{} = performance} = Schedule.create_performance(@valid_attrs)
-      assert performance.description == "some description"
-      assert performance.notes == "some notes"
-      assert performance.time == ~N[2010-04-17 14:00:00]
+      assert performance.name == "some name"
+      assert performance.desc == "some description"
       assert performance.seqnum == 1
     end
 
@@ -57,9 +58,8 @@ defmodule Runosaari.ScheduleTest do
       assert {:ok, %Performance{} = performance} =
                Schedule.update_performance(performance, @update_attrs)
 
-      assert performance.description == "some updated description"
-      assert performance.notes == "some updated notes"
-      assert performance.time == ~N[2011-05-18 15:01:01]
+      assert performance.name == "some updated name"
+      assert performance.desc == "some updated description"
       assert performance.seqnum == 2
     end
 
diff --git a/test/runosaari_web/controllers/performance_controller_test.exs b/test/runosaari_web/controllers/performance_controller_test.exs
index 063257e..1083e71 100644
--- a/test/runosaari_web/controllers/performance_controller_test.exs
+++ b/test/runosaari_web/controllers/performance_controller_test.exs
@@ -4,18 +4,18 @@ defmodule RunosaariWeb.PerformanceControllerTest do
   alias Runosaari.Schedule
 
   @create_attrs %{
-    description: "some description",
-    notes: "some notes",
-    time: ~N[2010-04-17 14:00:00],
+    name: "some name",
+    desc: "some description",
     seqnum: 1
   }
+
   @update_attrs %{
-    description: "some updated description",
-    notes: "some updated notes",
-    time: ~N[2011-05-18 15:01:01],
+    name: "some updated name",
+    desc: "some updated description",
     seqnum: 2
   }
-  @invalid_attrs %{description: nil, notes: nil, time: nil, seqnum: nil}
+
+  @invalid_attrs %{name: nil, desc: nil, seqnum: nil}
 
   def fixture(:performance) do
     {:ok, performance} = Schedule.create_performance(@create_attrs)
@@ -58,7 +58,7 @@ defmodule RunosaariWeb.PerformanceControllerTest do
 
     test "renders form for editing chosen performance", %{conn: conn, performance: performance} do
       conn = get(conn, Routes.admin_performance_path(conn, :edit, performance))
-      assert html_response(conn, 200) =~ "Muokkaa näytöstä"
+      assert html_response(conn, 200) =~ "Muokkaa näytöksen tietoja"
     end
   end
 
@@ -83,7 +83,7 @@ defmodule RunosaariWeb.PerformanceControllerTest do
           performance: @invalid_attrs
         )
 
-      assert html_response(conn, 200) =~ "Muokkaa näytöstä"
+      assert html_response(conn, 200) =~ "Muokkaa näytöksen tietoja"
     end
   end
 
diff --git a/test/runosaari_web/controllers/performer_controller_test.exs b/test/runosaari_web/controllers/performer_controller_test.exs
index 3e88b7e..4a70053 100644
--- a/test/runosaari_web/controllers/performer_controller_test.exs
+++ b/test/runosaari_web/controllers/performer_controller_test.exs
@@ -4,48 +4,21 @@ defmodule RunosaariWeb.PerformerControllerTest do
   alias Runosaari.Registration
 
   @create_attrs %{
-    confirmed: true,
-    email: "some email",
-    fname: "some fname",
-    lname: "some lname",
-    tel: "some tel",
-    desc: "some desc",
-    date1: true,
-    date2: true,
-    date3: true,
-    bus: true,
-    accom: true,
+    name: "some name",
+    desc: "some description",
+    confirmed: false,
     seqnum: 1
   }
+
   @update_attrs %{
-    confirmed: false,
-    email: "some updated email",
-    fname: "some updated fname",
-    lname: "some updated lname",
-    tel: "some updated tel",
-    desc: "some updated desc",
-    date1: true,
-    date2: true,
-    date3: true,
-    bus: true,
-    accom: true,
+    name: "some updated name",
+    desc: "some updated description",
+    confirmed: true,
     seqnum: 2
   }
 
-  @invalid_attrs %{
-    confirmed: nil,
-    email: nil,
-    fname: nil,
-    lname: nil,
-    tel: nil,
-    desc: nil,
-    date1: nil,
-    date2: nil,
-    date3: nil,
-    bus: nil,
-    accom: nil,
-    seqnum: nil
-  }
+  @invalid_attrs %{name: nil, desc: nil, confirmed: nil, seqnum: nil}
+
   def fixture(:performer) do
     {:ok, performer} = Registration.create_performer(@create_attrs)
     performer
@@ -69,11 +42,10 @@ defmodule RunosaariWeb.PerformerControllerTest do
     test "redirects to show when data is valid", %{conn: conn} do
       conn = post(conn, Routes.admin_performer_path(conn, :create), performer: @create_attrs)
 
-      assert %{id: id} = redirected_params(conn)
-      assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, id)
+      assert redirected_to(conn) == Routes.admin_performer_path(conn, :admin)
 
-      conn = get(conn, Routes.admin_performer_path(conn, :show, id))
-      assert html_response(conn, 200) =~ "Esiintyjän tiedot"
+      conn = get(conn, Routes.admin_performer_path(conn, :admin))
+      assert html_response(conn, 200) =~ "HALLINTA - Esiintyjät"
     end
 
     test "renders errors when data is invalid", %{conn: conn} do
@@ -101,7 +73,7 @@ defmodule RunosaariWeb.PerformerControllerTest do
       assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, performer)
 
       conn = get(conn, Routes.admin_performer_path(conn, :show, performer))
-      assert html_response(conn, 200) =~ "some updated email"
+      assert html_response(conn, 200) =~ "some updated name"
     end
 
     test "renders errors when data is invalid", %{conn: conn, performer: performer} do
diff --git a/test/runosaari_web/controllers/visitor_controller_test.exs b/test/runosaari_web/controllers/visitor_controller_test.exs
index 89ed9b6..2d07b93 100644
--- a/test/runosaari_web/controllers/visitor_controller_test.exs
+++ b/test/runosaari_web/controllers/visitor_controller_test.exs
@@ -4,37 +4,37 @@ defmodule RunosaariWeb.VisitorControllerTest do
   alias Runosaari.Registration
 
   @create_attrs %{
-    accom: true,
-    shared: true,
+    fname: "some fname",
+    lname: "some lname",
+    email: "some email",
+    tel: "some tel",
     date1: true,
     date2: true,
     date3: true,
-    email: "some email",
-    fname: "some fname",
-    lname: "some lname",
-    tel: "some tel"
+    accom: true,
+    shared: true
   }
   @update_attrs %{
-    accom: false,
-    shared: false,
+    fname: "some updated fname",
+    lname: "some updated lname",
+    email: "some updated email",
+    tel: "some updated tel",
     date1: false,
     date2: false,
     date3: false,
-    email: "some updated email",
-    fname: "some updated fname",
-    lname: "some updated lname",
-    tel: "some updated tel"
+    accom: false,
+    shared: false
   }
   @invalid_attrs %{
-    accom: nil,
-    shared: nil,
+    fname: nil,
+    lname: nil,
+    email: nil,
+    tel: nil,
     date1: nil,
     date2: nil,
     date3: nil,
-    email: nil,
-    fname: nil,
-    lname: nil,
-    tel: nil
+    accom: nil,
+    shared: nil
   }
 
   def fixture(:visitor) do
@@ -45,14 +45,14 @@ defmodule RunosaariWeb.VisitorControllerTest do
   describe "index" do
     test "lists all visitors", %{conn: conn} do
       conn = get(conn, Routes.admin_visitor_path(conn, :index))
-      assert html_response(conn, 200) =~ "Listing Visitors"
+      assert html_response(conn, 200) =~ "HALLINTA - Osallistujat"
     end
   end
 
   describe "new visitor" do
     test "renders form", %{conn: conn} do
       conn = get(conn, Routes.visitor_path(conn, :new))
-      assert html_response(conn, 200) =~ "New Visitor"
+      assert html_response(conn, 200) =~ "Ilmoittaudu"
     end
   end
 
@@ -60,16 +60,15 @@ defmodule RunosaariWeb.VisitorControllerTest do
     test "redirects to show when data is valid", %{conn: conn} do
       conn = post(conn, Routes.visitor_path(conn, :create), visitor: @create_attrs)
 
-      assert %{id: id} = redirected_params(conn)
-      assert redirected_to(conn) == Routes.admin_visitor_path(conn, :show, id)
+      assert redirected_to(conn) == Routes.visitor_path(conn, :confirmation)
 
-      conn = get(conn, Routes.admin_visitor_path(conn, :show, id))
-      assert html_response(conn, 200) =~ "Show Visitor"
+      conn = get(conn, Routes.visitor_path(conn, :confirmation))
+      assert html_response(conn, 200) =~ "Ilmoittautumisesi on rekisteröity."
     end
 
     test "renders errors when data is invalid", %{conn: conn} do
       conn = post(conn, Routes.visitor_path(conn, :create), visitor: @invalid_attrs)
-      assert html_response(conn, 200) =~ "New Visitor"
+      assert html_response(conn, 200) =~ "Ilmoittaudu"
     end
   end
 
@@ -78,7 +77,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
 
     test "renders form for editing chosen visitor", %{conn: conn, visitor: visitor} do
       conn = get(conn, Routes.admin_visitor_path(conn, :edit, visitor))
-      assert html_response(conn, 200) =~ "Edit Visitor"
+      assert html_response(conn, 200) =~ "Muokkaa osallistujan tietoja"
     end
   end
 
@@ -97,7 +96,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
     test "renders errors when data is invalid", %{conn: conn, visitor: visitor} do
       conn = put(conn, Routes.admin_visitor_path(conn, :update, visitor), visitor: @invalid_attrs)
 
-      assert html_response(conn, 200) =~ "Edit Visitor"
+      assert html_response(conn, 200) =~ "Muokkaa osallistujan tietoja"
     end
   end