diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 28f7782df..f5804310d 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -4,7 +4,7 @@
 ?>
 <nav class="nav_menu">
 	<?php if ($actual_view === 'normal' || $actual_view === 'reader') { ?>
-		<div class="group">
+		<div id="nav_menu_toggle_aside" class="group">
 			<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
 		</div>
 	<?php } ?>
@@ -33,7 +33,7 @@
 			href="<?= Minz_Url::display($url_state) ?>"><?= _i($state_str) ?></a>
 		<?php } ?>
 
-		<div class="dropdown only-mobile" id="dropdown-search-wrapper">
+		<div id="dropdown-search-wrapper" class="dropdown only-mobile">
 			<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 			<div id="dropdown-search" class="dropdown-target"></div>
 
@@ -65,7 +65,7 @@
 			<a class="dropdown-close" href="#close">❌</a>
 		</div>
 
-		<div class="dropdown">
+		<div id="nav_menu_queries" class="dropdown">
 			<div id="dropdown-query" class="dropdown-target"></div>
 
 			<a id="toggle-userqueries" class="dropdown-toggle btn" href="#dropdown-query" title="<?= _t('index.menu.queries') ?>"><?= _i('bookmark-tag') ?></a>
@@ -129,7 +129,7 @@
 		$mark_unread_url['params']['nextGet'] = $get;
 	?>
 
-	<div class="group stick" id="nav_menu_read_all">
+	<div id="nav_menu_read_all" class="group stick">
 		<form id="mark-read-menu" method="post">
 		<?php $confirm = FreshRSS_Context::userConf()->reading_confirm ? 'confirm" disabled="disabled' : ''; ?>
 		<button class="read_all btn <?= $confirm ?>"
@@ -137,7 +137,7 @@
 			formaction="<?= Minz_Url::display($mark_read_url) ?>"
 			type="submit"><?= _t('gen.action.mark_read') ?></button>
 
-		<div class="dropdown">
+		<div id="nav_menu_read" class="dropdown">
 			<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 			<div id="dropdown-read" class="dropdown-target"></div>
 
@@ -185,7 +185,7 @@
 	<?php } ?>
 
 	<?php $url_output = Minz_Request::currentRequest(); ?>
-	<div class="group" id="nav_menu_views">
+	<div id="nav_menu_views" class="group">
 		<?php
 		$readingModes = FreshRSS_ReadingMode::getReadingModes();
 		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
@@ -207,7 +207,7 @@
 
 	<?php $nav_menu_hooks = Minz_ExtensionManager::callHookString('nav_menu'); ?>
 	<?php if ($nav_menu_hooks != '') { ?>
-	<div class="group" id="nav_menu_hooks">
+	<div id="nav_menu_hooks" class="group">
 		<?= $nav_menu_hooks ?>
 	</div>
 	<?php } ?>
@@ -222,7 +222,7 @@
 		}
 		$url_order = Minz_Request::currentRequest();
 	?>
-	<div class="group">
+	<div id="nav_menu_sort" class="group">
 		<div class="dropdown">
 			<div id="dropdown-sort" class="dropdown-target"></div>
 			<a id="toggle-order" class="dropdown-toggle btn" href="#dropdown-sort" title="<?= _t('index.menu.sort') ?>"><?= _i($icon) ?></a>
@@ -259,7 +259,7 @@
 	</div>
 
 	<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous_refresh) { ?>
-		<div class="group">
+		<div id="nav_menu_actualize" class="group">
 			<a id="actualize" class="btn" href="<?= _url('feed', 'actualize') ?>" title="<?= _t('gen.action.actualize') ?>"><?= _i('refresh') ?></a>
 		</div>
 	<?php } ?>
diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css
index 30e213371..01f13635e 100644
--- a/p/themes/base-theme/frss.css
+++ b/p/themes/base-theme/frss.css
@@ -299,7 +299,7 @@ input.long {
 
 input, select, textarea {
 	display: inline-block;
-	max-width: 100%;
+	max-width: 85vw;
 	font-size: 0.8rem;
 	box-sizing: border-box;
 }
@@ -2513,6 +2513,23 @@ html.slider-active {
 		text-align: center;
 	}
 
+	.aside:not(.aside_feed) {
+		overflow-y: scroll;
+	}
+
+	nav.configure > .dropdown li.item.dropdown-section:last-child,
+	nav#aside_feed > ul li.item.nav-section:last-child {
+		margin-bottom: 6rem;
+	}
+
+	#dropdown-search-wrapper .dropdown-menu span {
+		text-wrap: wrap;
+	}
+
+	.form-advanced-title {
+		text-align: left;
+	}
+
 	.aside .feed .item-title {
 		padding-left: 0.75rem;
 		padding-right: 4rem;
diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css
index 97a5dccba..046133dee 100644
--- a/p/themes/base-theme/frss.rtl.css
+++ b/p/themes/base-theme/frss.rtl.css
@@ -299,7 +299,7 @@ input.long {
 
 input, select, textarea {
 	display: inline-block;
-	max-width: 100%;
+	max-width: 85vw;
 	font-size: 0.8rem;
 	box-sizing: border-box;
 }
@@ -2513,6 +2513,23 @@ html.slider-active {
 		text-align: center;
 	}
 
+	.aside:not(.aside_feed) {
+		overflow-y: scroll;
+	}
+
+	nav.configure > .dropdown li.item.dropdown-section:last-child,
+	nav#aside_feed > ul li.item.nav-section:last-child {
+		margin-bottom: 6rem;
+	}
+
+	#dropdown-search-wrapper .dropdown-menu span {
+		text-wrap: wrap;
+	}
+
+	.form-advanced-title {
+		text-align: right;
+	}
+
 	.aside .feed .item-title {
 		padding-right: 0.75rem;
 		padding-left: 4rem;