diff --git a/_artists/Artist1.md b/_artists/Artist1.md
deleted file mode 100644
index 8df0cd8..0000000
--- a/_artists/Artist1.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: Artist1
-position: Singer
----
-Test artist
diff --git a/_artists/test.md b/_artists/test.md
deleted file mode 100644
index d038690..0000000
--- a/_artists/test.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-short_name: test
-name: Test
-position: Producer
----
-Test artist
diff --git a/_config.yml b/_config.yml
index 02db53e..616b074 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,5 +19,5 @@ page_gen:
     template: song
     name: sname
   - data: artists
-    template: song
-    name: sid
\ No newline at end of file
+    template: artist
+    name: sname
\ No newline at end of file
diff --git a/_data/navigation.yml b/_data/navigation.yml
new file mode 100644
index 0000000..eb1c0fb
--- /dev/null
+++ b/_data/navigation.yml
@@ -0,0 +1,8 @@
+- name: Home
+  link:
+- name: Artists
+  link: artists.html
+- name: FAQ
+  link: faq.html
+- name: Streams
+  link: streams.html
\ No newline at end of file
diff --git a/_data/streams.yml b/_data/streams.yml
new file mode 100644
index 0000000..6fd5c30
--- /dev/null
+++ b/_data/streams.yml
@@ -0,0 +1,117 @@
+- date: '2019-01-24'
+  host: 'Voicians'
+  streamer: 'Anna Yvette'
+  live: true
+- date: '2019-01-31'
+  host: '!Roundup'
+  streamer: 'Anna Yvette'
+- date: '2019-02-07'
+  host: '!Throwback'
+  streamer: 'Anna Yvette'
+  throwbackHost: 'Sublab'
+- date: '2019-02-14'
+  host: 'Rameses B'
+  streamer: 'Anna Yvette'
+- date: '2019-02-21'
+  host: '!Throwback'
+  streamer: 'Approaching Nirvana'
+  throwbackHost: 'Laura Brehm, Arc North, Rival'
+- date: '2019-02-28'
+  host: '!Roundup'
+  streamer: 'Approaching Nirvana'
+- date: '2019-03-05'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-03-07'
+  host: 'Approaching Nirvana'
+  streamer: 'Approaching Nirvana'
+- date: '2019-03-12'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-03-14'
+  host: '!Throwback'
+  streamer: 'Anna Yvette'
+  throwbackHost: 'floatinurboat'
+- date: '2019-03-19'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-03-21'
+  host: '!Throwback'
+  streamer: 'Anna Yvette'
+  throwbackHost: 'CASHFORGOLD'
+- date: '2019-03-26'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-03-28'
+  host: 'Varien'
+  streamer: 'Anna Yvette'
+- date: '2019-04-02'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-04-04'
+  host: 'Au5'
+  streamer: 'Approaching Nirvana'
+- date: '2019-04-09'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-04-11'
+  host: 'Veela'
+  streamer: 'Approaching Nirvana'
+- date: '2019-04-16'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-04-18'
+  host: 'AK'
+  streamer: 'Approaching Nirvana'
+- date: '2019-04-23'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-04-25'
+  host: '!Throwback'
+  streamer: 'Approaching Nirvana'
+  throwbackHost: 'Arc North'
+- date: '2019-04-30'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-05-02'
+  host: 'Lucy Daydream'
+  streamer: 'Lucy Daydream'
+- date: '2019-05-07'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-05-09'
+  host: '!Roundup'
+  streamer: 'Cara Leigh'
+- date: '2019-05-14'
+  host: '!Chill'
+  streamer: 'Cara Leigh'
+- date: '2019-05-16'
+  host: 'Covex'
+  streamer: 'Anna Yvette'
+- date: '2019-05-21'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-05-23'
+  host: 'Laura Brehm'
+  streamer: 'Anna Yvette'
+- date: '2019-05-28'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-05-30'
+  host: 'Zoe Moon'
+  streamer: 'Anna Yvette'
+- date: '2019-06-04'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-06-06'
+  host: '!Roundup'
+  streamer: 'Anna Yvette'
+- date: '2019-06-11'
+  host: '!Chill'
+  streamer: 'Cara Leigh'
+- date: '2019-06-13'
+  host: 'Au5'
+- date: '2019-06-20'
+  host: 'Sublab'
+- date: '2019.06.27'
+  host: 'Miyoki'
\ No newline at end of file
diff --git a/_includes/songlist.html b/_includes/songlist.html
index af2ca50..117f8b2 100644
--- a/_includes/songlist.html
+++ b/_includes/songlist.html
@@ -2,17 +2,18 @@
     <p>
         {%- assign isFirst = true -%}
         {%- for artistName in song.artists -%}
-        {%- if isFirst == true -%}
-        {%- assign isFirst = false -%}
-        {%- else -%}, {% comment %} Comma and space to separate artists {% endcomment %}
-        {%- endif -%}
-        {%- assign artist = site.artists | where: 'name', artistName | first -%}
-        {%- if artist -%}
-        <a href="{{ artist.url | prepend: site.baseurl }}">{{ artist.name }}</a>
-        {%- else -%}
-        {{ artistName }}
-        {%- endif -%}
+            {%- if isFirst == true -%}
+                {%- assign isFirst = false -%}
+            {%- else -%}
+                , {% comment %} Comma and space to separate artists {% endcomment %}
+            {%- endif -%}
+            {%- assign artist = site.data.artists | where: 'sname', artistName | first -%}
+            {%- if artist -%}
+                <a href="{{ artist.sname | datapage_url: 'artists' }}">{{ artist.sname }}</a>
+            {%- else -%}
+                {{ artistName }}
+            {%- endif -%}
         {%- endfor -%}
-        {% comment %} Space needed {% endcomment %} - <a href="{{ song.url }}">{{ song.name }}</a>
+        {% comment %} Space needed {% endcomment %} - <a href="{{ site.baseurl }}/{{ song.sname | datapage_url: 'songs' }}">{{ song.sname }}</a>
     </p>
 </div>
\ No newline at end of file
diff --git a/_layouts/artist.html b/_layouts/artist.html
index ef16b26..9b16bda 100644
--- a/_layouts/artist.html
+++ b/_layouts/artist.html
@@ -1,16 +1,21 @@
 ---
 layout: default
 title: page.name
+ptitle: '{{ page.sname }}'
 ---
-<h1>{{ page.name }}</h1>
 <h2>{{ page.position }}</h2>
 
-{{ content }}
-
 <h2>Songs</h2>
 <ul>
-    {% assign filtered_songs = site.data.songs | where: 'artist', page.name %}
+    {% assign filtered_songs = site.data.songs %}
     {% for song in filtered_songs %}
-    <li><a href="{{ song.url }}">{{ song.artist }} - {{ song.title }}</a></li>
+        {% assign found = false %}
+        {% for artist in song.artists %}
+            {% if artist == page.sname %}
+                {% assign found = true %}
+            {% endif %}
+        {% endfor %}
+        {% if found == false %} {% continue %} {% endif %}
+    <li><a href="{{ site.baseurl }}/songs{{ song.sname | datapage_url: songs }}">{{ song.artists | join: ", " }} - {{ song.sname }}</a></li>
     {% endfor %}
 </ul>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index b55d605..2234593 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,25 +2,36 @@
 <html class="no-js" lang="">
 
 <head>
-  <meta charset="utf-8">
-  <title>{{ page.title }} - HS Fanpage</title>
-  <meta name="description" content="">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8">
+    <title>{{ page.title }} - HS Fanpage</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel="apple-touch-icon" href="{{ site.baseurl }}/icon.png">
-  <!-- Place favicon.ico in the root directory -->
-  <link rel="shortcut icon" type="image/x-icon" href="{{ site.baseurl }}/favicon.ico" />
+    <link rel="apple-touch-icon" href="{{ site.baseurl }}/icon.png">
+    <!-- Place favicon.ico in the root directory -->
+    <link rel="shortcut icon" type="image/x-icon" href="{{ site.baseurl }}/favicon.ico"/>
 
-  <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
 
-  <meta name="theme-color" content="#fafafa">
+    <meta name="theme-color" content="#fafafa">
 </head>
 
 <body>
 <div class="bg-image"></div>
-  <!--[if IE]>
-    <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience and security.</p>
-  <![endif]-->
+<h1>{{ page.ptitle | flatify }}</h1>
+<nav>
+    <ul>
+        {% for item in site.data.navigation %}
+        <li><a href="{{ site.baseurl }}/{{ item.link }}" {% if page.url== item.link %} style="color: red;" {% endif %}>
+            {{ item.name }}
+        </a></li>
+        {% endfor %}
+    </ul>
+</nav>
+<!--[if IE]>
+<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade
+    your browser</a> to improve your experience and security.</p>
+<![endif]-->
 
 {{ content }}
 </body>
diff --git a/_layouts/song.html b/_layouts/song.html
index f946c76..4cf203e 100644
--- a/_layouts/song.html
+++ b/_layouts/song.html
@@ -1,5 +1,5 @@
 ---
 layout: default
 title: asd
+ptitle: '{{ page.artists | join: ", " }} - {{ page.sname }}'
 ---
-<h1>{{ page.artists | join: ", " }} - {{ page.sname }}</h1>
diff --git a/_plugins/expand_nested_variable_filter.rb b/_plugins/expand_nested_variable_filter.rb
new file mode 100644
index 0000000..a48c55d
--- /dev/null
+++ b/_plugins/expand_nested_variable_filter.rb
@@ -0,0 +1,11 @@
+# http://acegik.net/blog/ruby/jekyll/plugins/howto-nest-liquid-template-variables-inside-yaml-front-matter-block.html
+
+module Jekyll
+  module ExpandNestedVariableFilter
+    def flatify(input)
+      Liquid::Template.parse(input).render(@context)
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::ExpandNestedVariableFilter)
\ No newline at end of file
diff --git a/artists.html b/artists.html
index 24ff198..cd142b9 100644
--- a/artists.html
+++ b/artists.html
@@ -1,12 +1,12 @@
 ---
 title: Artists
+ptitle: Artists
 ---
-<h1>Artists</h1>
-
 <ul>
-    {% for artist in site.artists %}
+    {% assign artists = site.data.artists | sort: 'sname' %}
+    {% for artist in artists %}
     <li>
-        <h2>{{ artist.name }}</h2>
+        <h2><a href="{{ site.baseurl }}/{{ artist.sname | datapage_url: 'artists' }}">{{ artist.sname }}</a></h2>
         <h3>{{ artist.position }}</h3>
         <p>{{ artist.content | markdownify }}</p>
     </li>
diff --git a/css/main.css b/css/main.css
index 07d8208..70dbb32 100644
--- a/css/main.css
+++ b/css/main.css
@@ -49,4 +49,28 @@ h1 {
 
 .content {
     /*background-color: #1f2523;*/
-}
\ No newline at end of file
+}
+
+nav ul { /* Menü */
+    list-style-type: none;
+    margin: auto;
+    display: table;
+}
+
+nav li {
+    display: inline-block;
+}
+
+nav li a {
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 20px 20px;
+    text-decoration: none;
+    font-weight: bold;
+    height: 23px;
+}
+
+nav li a:hover {
+    color: aqua;
+}
diff --git a/faq.md b/faq.md
index 9044009..2bd6b15 100644
--- a/faq.md
+++ b/faq.md
@@ -1,7 +1,7 @@
 ---
 title: FAQ
+ptitle: Frequently Asked Questions
 ---
-# Frequently Asked Questions
 ## What is Hidden Sounds?
 Hidden Sounds is a group of independent artists joining together to support 100% independent releases.
 
diff --git a/index.html b/index.html
index 06c63e0..cdace8f 100644
--- a/index.html
+++ b/index.html
@@ -1,20 +1,24 @@
 ---
 layout: default
 title: Hidden Sounds
+ptitle: Hidden Sounds Unofficial (Fan) Website
 ---
-<h1>Hidden Sounds Unofficial (Fan) Website</h1>
 <div id="popularSongs" class="content">
     <h2>Popular Songs</h2>
     <div id="popularContainer">
-        {% for song in site.data.songs %}
-        {% include songlist.html %}
+        {% assign popularSongs = site.data.songs | sort: 'popularity' | reverse %}
+        {% for song in popularSongs %}
+            {% if forloop.index > 10 %} {% break %} {% endif %}
+            {% include songlist.html %}
         {% endfor %}
     </div>
 </div>
 <div id="hiddenSongs" class="content">
     <h2>Hidden Songs</h2>
     <div id="hiddenContainer">
-        {% for song in site.data.songs %}
+        {% assign hiddenSongs = site.data.songs | sort: 'popularity' %}
+        {% for song in hiddenSongs %}
+        {% if forloop.index > 10 %} {% break %} {% endif %}
         {% include songlist.html %}
         {% endfor %}
     </div>
diff --git a/streams.html b/streams.html
new file mode 100644
index 0000000..829b729
--- /dev/null
+++ b/streams.html
@@ -0,0 +1,28 @@
+---
+title: Streams
+ptitle: Streams
+---
+
+<ul>
+{% assign streams = site.data.streams | reverse %}
+{% for stream in streams %}
+    <li>
+        <h2>
+            {%- if stream.host == '!Chill' -%}        Tuesday Chill Stream
+            {%- elsif stream.host == '!Throwback' -%}  Throwback: {{ stream.throwbackHost }}
+            {%- elsif stream.host == '!Roundup' -%}    Monthly Roundup
+            {%- else -%}                              {{- stream.host -}}
+            {%- endif -%}
+            {% if stream.live %} - LIVE {%- endif -%}
+        </h2>
+    </li>
+    <li>
+        {{ stream.date | date: "%a, %b %d, %Y" }}
+    </li>
+    {%- if stream.streamer -%} {% comment %} No streamer for future streams {% endcomment %}
+    <li>
+        Streamer: {{ stream.streamer }}
+    </li>
+    {%- endif -%}
+{% endfor %}
+</ul>