diff --git a/lib/runosaari_web/templates/layout/app.html.eex b/lib/runosaari_web/templates/layout/app.html.eex
index 46921ae..46ab21a 100644
--- a/lib/runosaari_web/templates/layout/app.html.eex
+++ b/lib/runosaari_web/templates/layout/app.html.eex
@@ -14,30 +14,25 @@
   </head>
   <body>
     <header >
-        <nav class="main-nav-bar" role="navigation">
-          <%= link "Etusivu", to: Routes.page_path(@conn, :index) %>
-          <%= link "Ohjelma", to: Routes.performance_path(@conn, :index) %>
-          <%= link "Esiintyjät", to: Routes.performer_path(@conn, :index) %>
-          <%= link "Info", to: Routes.page_path(@conn, :info) %>
-          <%= link "Covid-19", to: Routes.page_path(@conn, :covid19) %>
-          <%= link "Ilmoittautuminen", to: Routes.admin_performer_path(@conn, :new) %>
-        </nav>
-        <h1 class="mobile-main-title">
-          <a href="/#logo-container">Runosaari 2021</a>
-        </h1>
-        <nav class="mobile-main-nav-bar" id="nav-bar">
-          <a href="/#logo-container">Etusivu</a>
-          <a href="calendar.html#calendar-container"
-            >Ohjelma</a
-          >
-          <a href="performers.html#performers-container"
-            >Esiintyjät</a
-          >
-          <a href="contact.html#contact-container">Info</a>
-          <a href="covid19.html#covid-container"
-            >Covid-19</a
-          >
-        </nav>
+      <nav class="main-nav-bar" role="navigation">
+        <%= link "Etusivu", to: Routes.page_path(@conn, :index) %>
+        <%= link "Ohjelma", to: Routes.performance_path(@conn, :index) %>
+        <%= link "Esiintyjät", to: Routes.performer_path(@conn, :index) %>
+        <%= link "Info", to: Routes.page_path(@conn, :info) %>
+        <%= link "Covid-19", to: Routes.page_path(@conn, :covid19) %>
+        <%= link "Ilmoittautuminen", to: Routes.admin_performer_path(@conn, :new) %>
+      </nav>
+      <h1 class="mobile-main-title">
+        <a href="/#logo-container">Runosaari 2021</a>
+      </h1>
+      <nav class="mobile-main-nav-bar" id="nav-bar">
+        <%= link "Etusivu", to: "#{Routes.page_path(@conn, :index)}#logo-start" %>
+        <%= link "Ohjelma", to: "#{Routes.performance_path(@conn, :index)}#calendar-start" %>
+        <%= link "Esiintyjät", to: "#{Routes.performer_path(@conn, :index)}#performers-start" %>
+        <%= link "Info", to: "#{Routes.page_path(@conn, :info)}#contact-start" %>
+        <%= link "Covid-19", to: "#{Routes.page_path(@conn, :covid19)}#covid-start" %>
+        <%= link "Ilmoittautuminen", to: "#{Routes.admin_performer_path(@conn, :new)}#registration-start" %>
+      </nav>
     </header>
     <main role="main">
       <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
diff --git a/lib/runosaari_web/templates/page/covid19.html.eex b/lib/runosaari_web/templates/page/covid19.html.eex
index 2c07388..d8de210 100644
--- a/lib/runosaari_web/templates/page/covid19.html.eex
+++ b/lib/runosaari_web/templates/page/covid19.html.eex
@@ -1,4 +1,4 @@
-<h1>Covid-19-lauseke</h1>
+<h1 id="covid-start">Covid-19-lauseke</h1>
 <p>
     Järjestämme tilaisuuden voimassa olevien säädösten ja ohjeiden mukaan.
     Jotta yleisömäärää voidaan tarpeen vaatiessa rajata, koko tapahtumaan
diff --git a/lib/runosaari_web/templates/page/index.html.eex b/lib/runosaari_web/templates/page/index.html.eex
index bf90b34..9359c0e 100644
--- a/lib/runosaari_web/templates/page/index.html.eex
+++ b/lib/runosaari_web/templates/page/index.html.eex
@@ -1,6 +1,15 @@
 
-<section class="logo">
+<section class="logo" id="logo-start">
+  <picture>
+    <source
+      srcset="<%= Routes.static_path(@conn, "/images/runosaari-logo_small.jpg") %>"
+      media="(max-width: 600px)"
+      alt="Runosaari logo"
+    />
+    <source srcset="<%= Routes.static_path(@conn, "/images/runosaari-logo.jpg") %>" alt="Runosaari logo" />
     <img src="<%= Routes.static_path(@conn, "/images/runosaari-logo.jpg") %>" alt="Runosaari logo" />
+  </picture>
+  <div id="logo-credits"><div>@Sanna Hukkanen</div></div>
 </section>
 
 <section class="text">
diff --git a/lib/runosaari_web/templates/page/info.html.eex b/lib/runosaari_web/templates/page/info.html.eex
index 0d6de5d..db49513 100644
--- a/lib/runosaari_web/templates/page/info.html.eex
+++ b/lib/runosaari_web/templates/page/info.html.eex
@@ -1,4 +1,4 @@
-<h1>Info</h1>
+<h1 id="contact-start">Info</h1>
 <i>[Tietoja päivitetään]</i>
 <p>
     Tapahtuman järjestää Saariston Savotta ry:n Runosaari-työryhmä.<br />
@@ -18,9 +18,7 @@
 </p>
 <p>
     <b><i>Ota yhteyttä:</i></b> Inkeri Aula & Katariina Vuorinen,
-    <a class="email-link" href="mailto:info@runosaari.net"
-    >info@runosaari.net</a
-    >
+    <a class="email-link" href="mailto:info@runosaari.net">info@runosaari.net</a>
 </p>
 <h2><i>[TULOSSA]</i> <br />SURVIVAL-ohjeet saariston syrjäseudulle</h2>
 <ul>
diff --git a/lib/runosaari_web/templates/performance/index.html.eex b/lib/runosaari_web/templates/performance/index.html.eex
index 3d68164..a00830f 100644
--- a/lib/runosaari_web/templates/performance/index.html.eex
+++ b/lib/runosaari_web/templates/performance/index.html.eex
@@ -1,4 +1,4 @@
-<h1>Ohjelma</h1>
+<h1 id="calendar-start">Ohjelma</h1>
 
 <%= for performance <- @performances do %>
     <article>
diff --git a/lib/runosaari_web/templates/performer/index.html.eex b/lib/runosaari_web/templates/performer/index.html.eex
index 871bca6..930a3d6 100644
--- a/lib/runosaari_web/templates/performer/index.html.eex
+++ b/lib/runosaari_web/templates/performer/index.html.eex
@@ -1,4 +1,4 @@
-<h1>Esiintyjät</h1>
+<h1 id="performers-start">Esiintyjät</h1>
 
 <%= for performer <- @performers do %>
   <%= if performer.confirmed == true do %>
diff --git a/lib/runosaari_web/templates/performer/new.html.eex b/lib/runosaari_web/templates/performer/new.html.eex
index 3fed11a..7b83834 100644
--- a/lib/runosaari_web/templates/performer/new.html.eex
+++ b/lib/runosaari_web/templates/performer/new.html.eex
@@ -1,3 +1,3 @@
-<h1>Ilmoittaudu</h1>
+<h1 id="registration-start">Ilmoittaudu</h1>
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :create)) %>
