diff --git a/PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor b/PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor
index b890ea1..6775270 100644
--- a/PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor
+++ b/PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor
@@ -5,7 +5,7 @@
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 
-<MudStack AlignItems="AlignItems.Stretch">
+<MudStack>
     <MudTextField @bind-Value="_searchQuery"
                     @bind-Value:after="SearchTracks"
                     Variant="Variant.Outlined"
@@ -29,8 +29,7 @@
     </MudToggleGroup>
 
     <MudTable Items="@_searchResults"
-                Virtualize="true"
-                Height="400px"
+                Virtualize
                 Hover="true"
                 Breakpoint="Breakpoint.Sm"
                 Loading="@_isSearching">
diff --git a/PlaylistShared.Pwa/Layout/MainLayout.razor b/PlaylistShared.Pwa/Layout/MainLayout.razor
index 346cd8a..963ef10 100644
--- a/PlaylistShared.Pwa/Layout/MainLayout.razor
+++ b/PlaylistShared.Pwa/Layout/MainLayout.razor
@@ -21,13 +21,14 @@
         <NavMenu />
     </MudDrawer>
     
-    <MudMainContent Class="pt-16 pa-4" Style="display: flex; flex-direction: column; min-height: 100vh;">
-        <div style="flex: 1;">
+    <MudMainContent Class="pt-16 d-flex flex-column" Style="height: 100vh;">
+        <MudItem Class="flex-grow-1 overflow-y-auto">
             @Body
-        </div>
-        <div style="width: 100%; margin-top: 16px;">
+        </MudItem>
+
+        <MudItem>
             <AudioPlayer />
-        </div>
+        </MudItem>
     </MudMainContent>
 </MudLayout>