diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index db12d43..2ad80bd 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -4,15 +4,46 @@
     <title><%= title %></title>
 %= stylesheet '/style.css'
 %= stylesheet '/kwic-3.0.css'
+%= stylesheet '/fontawesome/font-awesome.min.css'
 %= javascript '/jquery-2.0.0.min.js'
+<meta charset="utf-8" />
   </head>
   <body>
-    <h1><%= title %></h1>
+%= notifications 'Alertify'
+
+<div id="top">
+%= image '/img/korap-logo.svg', style => 'position: absolute; z-index: 999'
 %= form_for url_for() => begin
 %= select_field ql => [[Poliqarp => 'poliqarp'], ['Cosmas II' => 'cosmas2']]
+<br />
 %= search_field 'q'
-%= submit_button
+<button type="submit" name="action" value="ok"><i class="fa fa-search"></i></button>
+<button type="submit" name="action" value="inspect"><i class="fa fa-code"></i></button>
 % end
+
+% if (param('q')) {
+<div id="button-right">
+<button type="button" onclick="$('#search > ol').toggleClass('left-aligned right-aligned'); $(this).children('i').toggleClass('fa-align-right fa-align-left')"><i class="fa fa-align-right"></i></button>
+</div>
+% }
+
+</div>
+
+<div id="sidebar" style="padding-top: 90px">
+  <fieldset style="margin: 0 17px;">
+    <legend>Virtual Collections</legend>
+  </fieldset>
+</div>
+
+<div id="search">
 %= content
+</div>
+
+%= javascript begin
+$("li,code,#sidebar").on("click", function () {
+  $(this).toggleClass('active');
+});
+% end
+
   </body>
 </html>
diff --git a/templates/query.html.ep b/templates/query.html.ep
new file mode 100644
index 0000000..5d09324
--- /dev/null
+++ b/templates/query.html.ep
@@ -0,0 +1,8 @@
+% use JSON::XS;
+
+% if (stash('search.query')) {
+<code><span>JSON-LD Query for <%= param 'q' %> (<%= param 'ql' %>)</span><pre>
+%  my $json = JSON::XS->new->pretty;
+%= $json->encode(stash('search.query'))
+</pre></span></code>
+% }
diff --git a/templates/search.html.ep b/templates/search.html.ep
index ff79562..b8df8d3 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -1,5 +1,4 @@
 % layout 'default', title 'KorAP';
-% use JSON::XS;
 
 
 %= search begin
@@ -8,7 +7,14 @@
 % my $url = url_with->query(['p' => '{page}']);
 % my $pages = (stash('search.totalResults') / (stash('search.itemsPerPage') || 1));
 % $pages = $pages < 0 ? 0 : $pages;
-<%= pagination(stash('search.startPage'), $pages, $url); %></span>
+</span>
+
+<div id="pagination">
+%= pagination(stash('search.startPage'), $pages, $url)
+</div>
+
+%#= l('Found <span id="total-results">[_1]</span> [quant,_1,match]')
+%#= l('in [_1])
 Found <span id="total-results"><%= commify(stash('search.totalResults')) %> matches</span>
 % if (stash 'search.bm.hit') {
  in <%= stash 'search.bm.hit' %> (<%= stash 'search.bm.result' %>)
@@ -16,17 +22,7 @@
 </p>
 </div>
 
-
-%= notifications 'Humane'
-
-
-% if (stash('search.query')) {
-<code><span>JSON-LD Query</span><pre>
-%  my $json = JSON::XS->new->pretty;
-%= $json->encode(stash('search.query'))
-</pre></span></code>
-% }
-
+%= include 'query'
 
 <ol class="left-aligned">
 %=  search_hits begin
@@ -37,10 +33,3 @@
 %   end
 </ol>
 % end
-
-
-%= javascript begin
-$("li,code").on("click", function () {
-  $(this).toggleClass('active');
-});
-% end