diff --git a/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt b/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt
index 2480d7d..1248370 100644
--- a/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt
+++ b/app/src/main/java/com/github/apognu/otter/adapters/BrowseTabsAdapter.kt
@@ -33,7 +33,7 @@ class BrowseTabsAdapter(val context: Fragment, manager: FragmentManager) : Fragm
 
   override fun getPageTitle(position: Int): String {
     return when (position) {
-      0 -> "Otter"
+      0 -> context.getString(R.string.title_discover)
       1 -> context.getString(R.string.artists)
       2 -> context.getString(R.string.albums)
       3 -> context.getString(R.string.playlists)
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/HomeFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/HomeFragment.kt
index 4e6f9fe..edb98c1 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/HomeFragment.kt
@@ -92,7 +92,7 @@ class HomeFragment : Fragment() {
 
       adapter = tagsAdapter
       layoutManager = FlexboxLayoutManager(context).apply {
-        justifyContent = JustifyContent.SPACE_BETWEEN
+        justifyContent = JustifyContent.FLEX_START
       }
     }
 
@@ -144,7 +144,7 @@ class HomeFragment : Fragment() {
   }
 
   private fun refresh(force: Boolean = false) {
-    tagsRepository.fetch(originFor(tagsRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _ ->
+    tagsRepository.fetch(originFor(tagsRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _, _ ->
       GlobalScope.launch(Main) {
         tagsAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.name, null) }
         tagsAdapter.notifyDataSetChanged()
@@ -156,9 +156,9 @@ class HomeFragment : Fragment() {
       }
     }
 
-    randomArtistsRepository.fetch(originFor(randomArtistsRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _ ->
+    randomArtistsRepository.fetch(originFor(randomArtistsRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _, _ ->
       GlobalScope.launch(Main) {
-        randomAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.name, it.albums?.getOrNull(0)?.cover?.original, artist = it) }
+        randomAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.name, it.albums?.getOrNull(0)?.cover?.urls?.original, artist = it) }
         randomAdapter.notifyDataSetChanged()
 
         random_loader?.visibility = View.GONE
@@ -168,9 +168,9 @@ class HomeFragment : Fragment() {
       }
     }
 
-    recentlyListenedRepository.fetch(originFor(recentlyListenedRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _ ->
+    recentlyListenedRepository.fetch(originFor(recentlyListenedRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _, _ ->
       GlobalScope.launch(Main) {
-        recentlyListenedAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.track.title, it.track.album.cover.original, track = it.track) }
+        recentlyListenedAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.track.title, it.track.album?.cover(), track = it.track) }
         recentlyListenedAdapter.notifyDataSetChanged()
 
         recently_listened_loader?.visibility = View.GONE
@@ -180,9 +180,9 @@ class HomeFragment : Fragment() {
       }
     }
 
-    recentlyAddedRepository.fetch(originFor(recentlyAddedRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _ ->
+    recentlyAddedRepository.fetch(originFor(recentlyAddedRepository, force).origin).untilNetwork(lifecycleScope, IO) { data, isCache, _, _ ->
       GlobalScope.launch(Main) {
-        recentlyAddedAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.title, it.album.cover.original, track = it) }
+        recentlyAddedAdapter.data = data.map { HomeMediaAdapter.HomeMediaItem(it.title, it.album?.cover(), track = it) }
         recentlyAddedAdapter.notifyDataSetChanged()
 
         recently_added_loader?.visibility = View.GONE
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/home/RandomArtistsRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/home/RandomArtistsRepository.kt
index a2bfa64..64460bc 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/home/RandomArtistsRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/home/RandomArtistsRepository.kt
@@ -3,10 +3,7 @@ package com.github.apognu.otter.repositories.home
 import android.content.Context
 import com.github.apognu.otter.repositories.HttpUpstream
 import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.Artist
-import com.github.apognu.otter.utils.ArtistsCache
-import com.github.apognu.otter.utils.ArtistsResponse
-import com.github.apognu.otter.utils.FunkwhaleResponse
+import com.github.apognu.otter.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,7 +12,7 @@ class RandomArtistsRepository(override val context: Context?) : Repository<Artis
   override val cacheId = "home-random-artists"
 
   override val upstream =
-    HttpUpstream<Artist, FunkwhaleResponse<Artist>>(
+    HttpUpstream<Artist, OtterResponse<Artist>>(
       HttpUpstream.Behavior.Single,
       "/api/v1/artists/?playable=true&ordering=random",
       object : TypeToken<ArtistsResponse>() {}.type,
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyAddedRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyAddedRepository.kt
index 51ff87d..764c5db 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyAddedRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyAddedRepository.kt
@@ -3,10 +3,7 @@ package com.github.apognu.otter.repositories.home
 import android.content.Context
 import com.github.apognu.otter.repositories.HttpUpstream
 import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.FunkwhaleResponse
-import com.github.apognu.otter.utils.Track
-import com.github.apognu.otter.utils.TracksCache
-import com.github.apognu.otter.utils.TracksResponse
+import com.github.apognu.otter.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,7 +12,7 @@ class RecentlyAddedRepository(override val context: Context?) : Repository<Track
   override val cacheId = "home-recently-added"
 
   override val upstream =
-    HttpUpstream<Track, FunkwhaleResponse<Track>>(
+    HttpUpstream<Track, OtterResponse<Track>>(
       HttpUpstream.Behavior.Single,
       "/api/v1/tracks/?playable=true&ordering=-creation_date",
       object : TypeToken<TracksResponse>() {}.type,
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyListenedRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyListenedRepository.kt
index 039c2e0..c8505ce 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyListenedRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/home/RecentlyListenedRepository.kt
@@ -3,10 +3,7 @@ package com.github.apognu.otter.repositories.home
 import android.content.Context
 import com.github.apognu.otter.repositories.HttpUpstream
 import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.FunkwhaleResponse
-import com.github.apognu.otter.utils.PlaylistTrack
-import com.github.apognu.otter.utils.PlaylistTracksCache
-import com.github.apognu.otter.utils.PlaylistTracksResponse
+import com.github.apognu.otter.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,7 +12,7 @@ class RecentlyListenedRepository(override val context: Context?) : Repository<Pl
   override val cacheId = "home-recently-listened"
 
   override val upstream =
-    HttpUpstream<PlaylistTrack, FunkwhaleResponse<PlaylistTrack>>(
+    HttpUpstream<PlaylistTrack, OtterResponse<PlaylistTrack>>(
       HttpUpstream.Behavior.Single,
       "/api/v1/history/listenings/?playable=true",
       object : TypeToken<PlaylistTracksResponse>() {}.type,
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/home/TagsRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/home/TagsRepository.kt
index 4a9ae47..f78cefd 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/home/TagsRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/home/TagsRepository.kt
@@ -3,10 +3,7 @@ package com.github.apognu.otter.repositories.home
 import android.content.Context
 import com.github.apognu.otter.repositories.HttpUpstream
 import com.github.apognu.otter.repositories.Repository
-import com.github.apognu.otter.utils.FunkwhaleResponse
-import com.github.apognu.otter.utils.Tag
-import com.github.apognu.otter.utils.TagsCache
-import com.github.apognu.otter.utils.TagsResponse
+import com.github.apognu.otter.utils.*
 import com.github.kittinunf.fuel.gson.gsonDeserializerOf
 import com.google.gson.reflect.TypeToken
 import java.io.BufferedReader
@@ -15,7 +12,7 @@ class TagsRepository(override val context: Context?) : Repository<Tag, TagsCache
   override val cacheId = "home-tags"
 
   override val upstream =
-    HttpUpstream<Tag, FunkwhaleResponse<Tag>>(
+    HttpUpstream<Tag, OtterResponse<Tag>>(
       HttpUpstream.Behavior.Single,
       "/api/v1/tags/",
       object : TypeToken<TagsResponse>() {}.type
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c93ebf7..0916664 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,6 +12,7 @@
     <string name="login_error_hostname_https">Le nom d\'hôte Funkwhale devrait être sécurisé à travers HTTPS</string>
     <string name="login_error_userinfo">Nous n\'avons pas pu récupérer les informations à propos de votre utilisateur</string>
     <string name="toolbar_search">Rechercher</string>
+    <string name="title_discover">Découvrir</string>
     <string name="title_downloads">Téléchargements</string>
     <string name="title_settings">Paramètres</string>
     <string name="title_oss_licences">Licences open source</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3461b9d..c943f67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
   <string name="login_error_hostname_https">The Funkwhale hostname should be secure through HTTPS</string>
   <string name="login_error_userinfo">We could not retrieve information about your user</string>
   <string name="toolbar_search">Search</string>
+  <string name="title_discover">Discover</string>
   <string name="title_downloads">Downloads</string>
   <string name="title_settings">Settings</string>
   <string name="title_oss_licences">Open source licences</string>