diff --git a/AudioCuesheetEditor/Shared/MainLayout.razor b/AudioCuesheetEditor/Shared/MainLayout.razor
index 61c3f7ac..e91f2f46 100644
--- a/AudioCuesheetEditor/Shared/MainLayout.razor
+++ b/AudioCuesheetEditor/Shared/MainLayout.razor
@@ -37,7 +37,7 @@ along with Foobar.  If not, see
         <CascadingValue Value="@this">
             <Layout>
                 <LayoutHeader Fixed Position="Position.Sticky">
-                    <Bar Background="Background.Dark" ThemeContrast="ThemeContrast.Dark" Breakpoint="Breakpoint.Tablet">
+                    <Bar Background="Background.Dark" ThemeContrast="ThemeContrast.Dark" Breakpoint="Breakpoint.Medium">
                         @if ((displayMenuBar) && (sidebar != null))
                         {
                             //Just a little a hack for displaying a toggler for the sidebar always and independent from the breakpoint of the top bar
@@ -71,9 +71,7 @@ along with Foobar.  If not, see
                                                     <path fill-rule="evenodd" d="M8 3a5 5 0 1 1-4.546 2.914.5.5 0 0 0-.908-.417A6 6 0 1 0 8 2z" />
                                                     <path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466" />
                                                 </svg>
-                                                <Text>
-                                                    @_localizer["Undo"]
-                                                </Text>
+                                                @_localizer["Undo"]
                                             </Button>
                                         </Tooltip>
                                     </BarItem>
@@ -84,9 +82,7 @@ along with Foobar.  If not, see
                                                     <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2z" />
                                                     <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466" />
                                                 </svg>
-                                                <Text>
-                                                    @_localizer["Redo"]
-                                                </Text>
+                                                @_localizer["Redo"]
                                             </Button>
                                         </Tooltip>
                                     </BarItem>
@@ -421,8 +417,6 @@ along with Foobar.  If not, see
 </ModalExportdialog>
 
 @code {
-    //TODO: Top Menu
-    //TODO: Make text of undo/redo display only when space is available
     //TODO: Language selection in top menu
     Bar? sidebar;