diff --git a/Frontend/Pages/BotHeader.razor b/Frontend/Pages/BotHeader.razor
index 2b8716a0..aa53d63d 100644
--- a/Frontend/Pages/BotHeader.razor
+++ b/Frontend/Pages/BotHeader.razor
@@ -22,7 +22,6 @@
         <div class="d-flex">
             <div class="p-2 flex-grow-1 bd-highlight">
                 Player
-                <ThemeSwitcher />
             </div>
             <div class="p-2 bd-highlight">
                 <div class="align-items-start">
diff --git a/Frontend/Pages/GoalsComponent.razor b/Frontend/Pages/GoalsComponent.razor
index cb2f3665..cb95dcfa 100644
--- a/Frontend/Pages/GoalsComponent.razor
+++ b/Frontend/Pages/GoalsComponent.razor
@@ -10,17 +10,14 @@
     <CardHeader>
         <div class="d-flex">
             <div class="p-2 flex-grow-1 bd-highlight">
-                Goals
+                Goals<br/>
+                @PlayerReader.MinRange()-@PlayerReader.MaxRange()
             </div>
             <div class="p-2 bd-highlight">
-                @PlayerReader.MinRange() - @PlayerReader.MaxRange()
-
-                @ttk.Time.ToString("F1")
-
                 <span>
-                    Net: @PlayerReader.NetworkLatency.ToString()ms |
                     Npc: @NpcLatency.ToString("0.0")ms |
-                    Bot: @addonReader.AvgUpdateLatency.ToString("0.0")ms
+                    Bot: @addonReader.AvgUpdateLatency.ToString("0.0")ms<br/>
+                    Net: @PlayerReader.NetworkLatency.ToString()ms
                 </span>
             </div>
             <div class="p-2 bd-highlight">
diff --git a/Frontend/Pages/RouteComponent.razor b/Frontend/Pages/RouteComponent.razor
index 0919990f..32b4c133 100644
--- a/Frontend/Pages/RouteComponent.razor
+++ b/Frontend/Pages/RouteComponent.razor
@@ -22,7 +22,6 @@
         <div class="d-flex">
             <div class="p-2 flex-grow-1 bd-highlight">
                 Route @routeSymbol
-                <ThemeSwitcher OnThemeChanged="OnThemeChanged" />
             </div>
 
             <div class="p-2 bd-highlight">
diff --git a/Frontend/Shared/MainLayout.razor b/Frontend/Shared/MainLayout.razor
index c48e097c..0fecf8b6 100644
--- a/Frontend/Shared/MainLayout.razor
+++ b/Frontend/Shared/MainLayout.razor
@@ -9,13 +9,16 @@
 
 <BlazorBootstrapLayout>
     <SidebarSection>
-        <Sidebar2 Href="/"
-                  @ref="sidebar"
-                  Title="Puppet"
-                  DataProvider="Sidebar2DataProvider"
-                  Width="146"
-                  WidthUnit="Unit.Px">
-        </Sidebar2>
+        <div class="grid">
+            <ThemeSwitcher Class="ms-5" />
+            <Sidebar2 Href="/"
+                      @ref="sidebar"
+                      Title="Puppet"
+                      DataProvider="Sidebar2DataProvider"
+                      Width="146"
+                      WidthUnit="Unit.Px">
+            </Sidebar2>
+        </div>
     </SidebarSection>
 
     <ContentSection>