diff --git a/DeepDrftManager/Components/Pages/Tracks/CmsAlbumBrowser.razor b/DeepDrftManager/Components/Pages/Tracks/CmsAlbumBrowser.razor
index fdcc781..948e9ab 100644
--- a/DeepDrftManager/Components/Pages/Tracks/CmsAlbumBrowser.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/CmsAlbumBrowser.razor
@@ -128,36 +128,38 @@ else
                                     <MudTd DataLabel="#">@track.TrackNumber</MudTd>
                                     <MudTd DataLabel="Track Name">@track.TrackName</MudTd>
                                     <MudTd DataLabel="Profile">
-                                        @if (HasProfile(track.EntryKey))
-                                        {
-                                            <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
-                                        }
-                                        else
-                                        {
-                                            <MudTooltip Text="Generate profile">
+                                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                                            @if (HasProfile(track.EntryKey))
+                                            {
+                                                <MudTooltip Text="Profile generated">
+                                                    <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
+                                                </MudTooltip>
+                                            }
+                                            <MudTooltip Text="@(HasProfile(track.EntryKey) ? "Regenerate profile" : "Generate profile")">
                                                 <MudIconButton Icon="@Icons.Material.Filled.GraphicEq"
                                                                Size="Size.Small"
                                                                Color="Color.Secondary"
                                                                Disabled="@_generating.Contains(track.EntryKey)"
                                                                OnClick="@(() => GenerateProfileAsync(track))" />
                                             </MudTooltip>
-                                        }
+                                        </MudStack>
                                     </MudTd>
                                     <MudTd DataLabel="High-res">
-                                        @if (HasHighRes(track.EntryKey))
-                                        {
-                                            <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
-                                        }
-                                        else
-                                        {
-                                            <MudTooltip Text="Generate high-res datum">
+                                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                                            @if (HasHighRes(track.EntryKey))
+                                            {
+                                                <MudTooltip Text="High-res datum generated">
+                                                    <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
+                                                </MudTooltip>
+                                            }
+                                            <MudTooltip Text="@(HasHighRes(track.EntryKey) ? "Regenerate high-res datum" : "Generate high-res datum")">
                                                 <MudIconButton Icon="@Icons.Material.Filled.Waves"
                                                                Size="Size.Small"
                                                                Color="Color.Secondary"
                                                                Disabled="@_generatingHighRes.Contains(track.EntryKey)"
                                                                OnClick="@(() => GenerateHighResAsync(track))" />
                                             </MudTooltip>
-                                        }
+                                        </MudStack>
                                     </MudTd>
                                     @* Per-track info tooltip (restored from the retired CmsTrackGrid's
                                        .cms-track-info monospace block): EntryKey + OriginalFileName. *@
diff --git a/DeepDrftManager/Components/Pages/Tracks/CmsMixBrowser.razor b/DeepDrftManager/Components/Pages/Tracks/CmsMixBrowser.razor
index 04faaca..bab501a 100644
--- a/DeepDrftManager/Components/Pages/Tracks/CmsMixBrowser.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/CmsMixBrowser.razor
@@ -94,33 +94,35 @@ else
         @{ var row = RowFor(release); }
         @if (row is not null)
         {
-            @if (row.HasWaveform)
-            {
-                <MudTooltip Text="Waveform generated">
-                    <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
-                </MudTooltip>
-            }
-            else
-            {
-                <MudTooltip Text="No waveform — incomplete">
-                    <MudIcon Icon="@Icons.Material.Filled.Cancel" Color="Color.Warning" Size="Size.Small" />
-                </MudTooltip>
-            }
-            <MudButton Variant="Variant.Outlined"
-                       Size="Size.Small"
-                       StartIcon="@Icons.Material.Filled.GraphicEq"
-                       Disabled="@row.IsGenerating"
-                       OnClick="@(() => GenerateWaveformAsync(row))">
-                @if (row.IsGenerating)
+            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                @if (row.HasWaveform)
                 {
-                    <MudProgressCircular Class="mr-2" Size="Size.Small" Indeterminate="true" />
-                    <span>Generating…</span>
+                    <MudTooltip Text="Waveform generated">
+                        <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" Size="Size.Small" />
+                    </MudTooltip>
                 }
                 else
                 {
-                    <span>@(row.HasWaveform ? "Regenerate" : "Generate")</span>
+                    <MudTooltip Text="No waveform — incomplete">
+                        <MudIcon Icon="@Icons.Material.Filled.Cancel" Color="Color.Warning" Size="Size.Small" />
+                    </MudTooltip>
                 }
-            </MudButton>
+                <MudButton Variant="Variant.Outlined"
+                           Size="Size.Small"
+                           StartIcon="@Icons.Material.Filled.GraphicEq"
+                           Disabled="@row.IsGenerating"
+                           OnClick="@(() => GenerateWaveformAsync(row))">
+                    @if (row.IsGenerating)
+                    {
+                        <MudProgressCircular Class="mr-2" Size="Size.Small" Indeterminate="true" />
+                        <span>Generating…</span>
+                    }
+                    else
+                    {
+                        <span>@(row.HasWaveform ? "Regenerate" : "Generate")</span>
+                    }
+                </MudButton>
+            </MudStack>
         }
     </text>;
 
diff --git a/DeepDrftManager/Components/Pages/Tracks/CmsSessionBrowser.razor b/DeepDrftManager/Components/Pages/Tracks/CmsSessionBrowser.razor
index c0eb71c..3dee616 100644
--- a/DeepDrftManager/Components/Pages/Tracks/CmsSessionBrowser.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/CmsSessionBrowser.razor
@@ -85,13 +85,16 @@ else
 
     protected override void OnInitialized()
     {
-        _specialColumns = new[] { new SpecialActionColumn("Hero", HeroCell) };
+        _specialColumns = new[]
+        {
+            new SpecialActionColumn("Hero", HeroThumbCell),
+            new SpecialActionColumn("", HeroButtonCell),
+        };
         base.OnInitialized();
     }
 
-    // Per-row cell for the dedicated "Hero" column: thumbnail preview plus set/replace upload button with
-    // progress. Recovers the typed SessionRow via RowFor; skips rendering for a release not on the page.
-    private RenderFragment<ReleaseDto> HeroCell => release =>@<text>
+    // Per-row cell for the "Hero" thumbnail column: just the image preview div.
+    private RenderFragment<ReleaseDto> HeroThumbCell => release =>@<text>
         @{ var row = RowFor(release); }
         @if (row is not null)
         {
@@ -103,6 +106,14 @@ else
             {
                 <div class="cms-album-thumb cms-album-thumb--fallback"></div>
             }
+        }
+    </text>;
+
+    // Per-row cell for the "Hero Image" upload button column: set/replace upload button with progress.
+    private RenderFragment<ReleaseDto> HeroButtonCell => release =>@<text>
+        @{ var row = RowFor(release); }
+        @if (row is not null)
+        {
             <MudFileUpload T="IBrowserFile"
                            Accept="image/*"
                            FilesChanged="@(file => UploadHeroAsync(row, file))"