diff --git a/lib/Core/EpisodeAction/EpisodeActionReader.php b/lib/Core/EpisodeAction/EpisodeActionReader.php
index 879a1e6..08c31ab 100644
--- a/lib/Core/EpisodeAction/EpisodeActionReader.php
+++ b/lib/Core/EpisodeAction/EpisodeActionReader.php
@@ -107,7 +107,10 @@ class EpisodeActionReader extends GPodderSyncEpisodeActionReader
 		return $episodes;
 	}
 
-	private function stringOrNull(mixed $value): ?string
+	/**
+	 * @param null|\SimpleXMLElement|string $value
+	 */
+	private function stringOrNull($value): ?string
 	{
 		if ($value) {
 			return (string) $value;
diff --git a/src/components/Discover/TopList.vue b/src/components/Discover/TopList.vue
index 57525a1..3b92e70 100644
--- a/src/components/Discover/TopList.vue
+++ b/src/components/Discover/TopList.vue
@@ -1,21 +1,18 @@
 <template>
-	<fragment>
-		<p>
-			<span>{{ t('Discover') }}</span>
+	<div>
+		<NcLoadingIcon v-if="loading" />
+		<ul v-if="!loading" class="tops">
+			<li v-for="top in tops" :key="top.link">
+				<TopItem :author="top.author"
+					:image-url="top.imageUrl"
+					:link="top.link"
+					:title="top.title" />
+			</li>
+		</ul>
+		<p v-if="!loading" class="caption">
+			{{ t('Suggests by fyyd') }}
 		</p>
-		<p>
-			<NcLoadingIcon v-if="loading" />
-			<ul v-if="!loading" class="tops">
-				<li v-for="top in tops" :key="top.link">
-					<TopItem :author="top.author"
-						:image-url="top.imageUrl"
-						:link="top.link"
-						:title="top.title" />
-				</li>
-			</ul>
-			<span class="caption">{{ t('Suggests by fyyd') }}</span>
-		</p>
-	</fragment>
+	</div>
 </template>
 
 <script>
@@ -53,20 +50,24 @@ export default {
 </script>
 
 <style scoped>
-	.caption {
-		float: right;
-		font-size: small;
-		margin: .5rem;
+	div {
+		margin: 2rem 0;
 	}
 
-	.tops {
+	li {
+		flex-basis: 15%;
+	}
+
+	p {
+		font-size: small;
+		margin: .5rem;
+		text-align: right;
+	}
+
+	ul {
 		display: flex;
 		flex-wrap: wrap;
 		gap: 2rem 5%;
 		justify-content: center;
 	}
-
-	.tops li {
-		flex-basis: 15%;
-	}
 </style>
diff --git a/src/components/Feed/Banner.vue b/src/components/Feed/Banner.vue
index 31352f3..6997f9c 100644
--- a/src/components/Feed/Banner.vue
+++ b/src/components/Feed/Banner.vue
@@ -107,6 +107,7 @@ export default {
 
 	.header {
 		height: 14rem;
+		overflow: hidden;
 		padding: 2rem;
 		position: relative;
 	}
diff --git a/src/components/Feed/List.vue b/src/components/Feed/List.vue
index 62b2b91..13a347c 100644
--- a/src/components/Feed/List.vue
+++ b/src/components/Feed/List.vue
@@ -46,11 +46,3 @@ export default {
 	},
 }
 </script>
-
-<style scoped>
-	ul {
-		background-color: rgba(0, 0, 0, .9);
-		height: 100%;
-		overflow: auto;
-	}
-</style>
diff --git a/src/views/Discover.vue b/src/views/Discover.vue
index dbb21f0..d50cb8a 100644
--- a/src/views/Discover.vue
+++ b/src/views/Discover.vue
@@ -1,20 +1,18 @@
 <template>
-	<div class="main">
-		<p>
-			<NcTextField :label="t('Find a podcast')" :value.sync="search">
-				<Magnify :size="20" />
-			</NcTextField>
-		</p>
+	<NcAppContent class="main">
+		<NcTextField class="search" :label="t('Find a podcast')" :value.sync="search">
+			<Magnify :size="20" />
+		</NcTextField>
 		<Search v-if="search" :value="search" />
 		<TopList v-if="!search" />
 		<AddRss v-if="!search" />
-	</div>
+	</NcAppContent>
 </template>
 
 <script>
+import { NcAppContent, NcTextField } from '@nextcloud/vue'
 import AddRss from '../components/Discover/AddRss.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
-import { NcTextField } from '@nextcloud/vue'
 import Search from '../components/Discover/Search.vue'
 import TopList from '../components/Discover/TopList.vue'
 
@@ -23,6 +21,7 @@ export default {
 	components: {
 		AddRss,
 		Magnify,
+		NcAppContent,
 		NcTextField,
 		Search,
 		TopList,
@@ -37,9 +36,11 @@ export default {
 
 <style scoped>
 	.main {
-		display: flex;
-		flex-direction: column;
-		gap: 1rem;
-		margin: 15px 51px;
+		padding: 15px 51px;
+		overflow: hidden;
+	}
+
+	.search {
+		margin-bottom: 1rem;
 	}
 </style>
diff --git a/src/views/Feed.vue b/src/views/Feed.vue
index 313e9da..d2787e7 100644
--- a/src/views/Feed.vue
+++ b/src/views/Feed.vue
@@ -1,5 +1,5 @@
 <template>
-	<fragment>
+	<NcAppContent>
 		<NcLoadingIcon v-if="loading" />
 		<NcEmptyContent v-if="failed" :name="t('Error loading feed')">
 			<template #icon>
@@ -13,11 +13,11 @@
 			:link="feed.link"
 			:title="feed.title" />
 		<List v-if="feed" />
-	</fragment>
+	</NcAppContent>
 </template>
 
 <script>
-import { NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
+import { NcAppContent, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
 import Alert from 'vue-material-design-icons/Alert.vue'
 import Banner from '../components/Feed/Banner.vue'
 import List from '../components/Feed/List.vue'
@@ -29,6 +29,7 @@ export default {
 	components: {
 		Alert,
 		Banner,
+		NcAppContent,
 		NcEmptyContent,
 		NcLoadingIcon,
 		List,
diff --git a/src/views/Index.vue b/src/views/Index.vue
index c412ac8..c52e6d8 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -17,15 +17,12 @@
 				</ul>
 			</NcAppContentList>
 		</NcAppNavigation>
-		<NcAppContent>
-			<router-view />
-		</NcAppContent>
+		<router-view />
 	</fragment>
 </template>
 
 <script>
 import {
-	NcAppContent,
 	NcAppContentList,
 	NcAppNavigation,
 	NcAppNavigationNew,
@@ -39,7 +36,6 @@ export default {
 	name: 'Index',
 	components: {
 		Item,
-		NcAppContent,
 		NcAppContentList,
 		NcAppNavigation,
 		NcAppNavigationNew,