diff --git a/src/library/album/AlbumLibrary.vue b/src/library/album/AlbumLibrary.vue
index 0b9233f..1d5ca7a 100644
--- a/src/library/album/AlbumLibrary.vue
+++ b/src/library/album/AlbumLibrary.vue
@@ -1,43 +1,59 @@
 <template>
   <div>
+    <ul class="nav-underlined">
+      <li v-for="{ value, text } in categories" :key="value">
+        <router-link :to="{... $route, params: {... $route.params, sort: value }}">
+          {{ text }}
+        </router-link>
+      </li>
+    </ul>
     <Spinner v-slot="{ data }" :data="albums">
-      <AlbumList :items="data" />
+      <AlbumList v-if="albums" :items="data" />
     </Spinner>
   </div>
 </template>
 <script lang="ts">
   import Vue from 'vue'
   import AlbumList from './AlbumList.vue'
-  import { AlbumSort, Album } from '@/shared/api'
+  import { Album, AlbumSort } from '@/shared/api'
+
+  const categoryToSort = {
+    'a-z': 'alphabeticalByName',
+    'recently-added': 'newest',
+    'recently-played': 'recent',
+    'most-played': 'frequent',
+    random: 'random',
+  } as {[key: string]: AlbumSort}
 
   export default Vue.extend({
     components: {
       AlbumList,
     },
+    props: {
+      sort: { type: String, required: true },
+    },
     data() {
       return {
-        sort: 'newest',
         albums: null as null | Album[],
       }
     },
     computed: {
-      sortOptions() {
+      categories() {
         return [
-          { text: 'A-Z', value: 'alphabeticalByName' },
-          { text: 'Date', value: 'newest' },
-          { text: 'frequent', value: 'frequent' },
-        // { text: "random", value: "random" },
-        // { text: "recent", value: "recent" },
-        // { text: "starred", value: "starred" },
+          { text: 'A-Z', value: 'a-z' },
+          { text: 'Recently added', value: 'recently-added' },
+          { text: 'Recently played', value: 'recently-played' },
+          { text: 'Most played', value: 'most-played' },
+          { text: 'Random', value: 'random' },
         ]
       }
     },
     watch: {
       sort: {
         immediate: true,
-        handler(value: AlbumSort) {
+        handler(value: string) {
           this.albums = null
-          this.$api.getAlbums(value).then(albums => {
+          this.$api.getAlbums(categoryToSort[value]).then(albums => {
             this.albums = albums
           })
         }
diff --git a/src/shared/router.ts b/src/shared/router.ts
index cb1fb47..6ece53e 100644
--- a/src/shared/router.ts
+++ b/src/shared/router.ts
@@ -42,7 +42,16 @@ export function setupRouter(auth: AuthService) {
       {
         name: 'albums',
         path: '/albums',
-        component: AlbumLibrary
+        redirect: {
+          name: 'albums-params',
+          params: { sort: 'a-z' }
+        }
+      },
+      {
+        name: 'albums-params',
+        path: '/albums/:sort',
+        component: AlbumLibrary,
+        props: true
       },
       {
         name: 'album',
diff --git a/src/style/main.scss b/src/style/main.scss
index 839f85a..dccc1ed 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -62,6 +62,8 @@ h1, h2, h3, h4, h5 {
   box-shadow: none !important;
 }
 
+@import './nav';
+
 $enable-print-styles: false;
 $enable-responsive-font-sizes: true;
 
diff --git a/src/style/nav.scss b/src/style/nav.scss
new file mode 100644
index 0000000..ff81720
--- /dev/null
+++ b/src/style/nav.scss
@@ -0,0 +1,28 @@
+ul.nav-underlined {
+  white-space: nowrap;
+  overflow-x: auto;
+  scrollbar-width: none;
+  padding-left: 0;
+
+  li {
+    display: inline-block;
+    float: none;
+    a {
+      display: block;
+      padding: 0.5rem 1rem;
+    }
+    a:hover, a:focus {
+      text-decoration: none;
+    }
+    a.active {
+      border-bottom: 2px solid;
+    }
+    a.active:hover {
+      color: var(--primary);
+    }
+  }
+}
+
+ul.nav-underlined::-webkit-scrollbar {
+  display: none;
+}