diff --git a/lib/Korap.pm b/lib/Korap.pm
index 9c7ddda..bf61bfa 100644
--- a/lib/Korap.pm
+++ b/lib/Korap.pm
@@ -43,12 +43,11 @@
     }
   );
 
-  $r->get('/')->to('search#remote');
+  $r->get('/')->to('search#remote')->name('index');
   $r->get('/util/query')->to('search#query');
 
   # Tutorial
-  $r->get('/tutorial')->to('tutorial#page')->name('tutorial');
-  $r->get('/tutorial/(*tutorial)')->to('tutorial#page');
+  $r->get('/tutorial/(*tutorial)', { tutorial => 'start' })->to('tutorial#page')->name('tutorial');
 
   my $collection = $r->route('/collection');
   $collection->to('search#info');
diff --git a/lib/Korap/Tutorial.pm b/lib/Korap/Tutorial.pm
index 224190f..2b54e77 100644
--- a/lib/Korap/Tutorial.pm
+++ b/lib/Korap/Tutorial.pm
@@ -3,7 +3,13 @@
 
 sub page {
   my $c = shift;
-  $c->layout('snippet');
+
+  if ($c->param('snippet')) {
+    $c->layout('snippet');
+  }
+  else {
+    $c->layout('default');
+  };
   $c->title('KorAP');
 
   my $page = $c->stash('tutorial');