diff --git a/Wonky.Client/Components/AppSandbox.razor b/Wonky.Client/Components/AppSandbox.razor
index cf41197c..4233329e 100644
--- a/Wonky.Client/Components/AppSandbox.razor
+++ b/Wonky.Client/Components/AppSandbox.razor
@@ -18,7 +18,7 @@
 
 @if (_app!.Sandbox)
 {
-    <div class="badge text-bg-danger mx-3">EDU DEMO</div>
+    <div class="badge text-bg-danger mx-3 pt-2">DEMO SANDKASSE</div>
 }
 @code
 {
diff --git a/Wonky.Client/Components/TopbarDisplayUser.razor b/Wonky.Client/Components/TopbarDisplayUser.razor
index 3006738a..c775236e 100644
--- a/Wonky.Client/Components/TopbarDisplayUser.razor
+++ b/Wonky.Client/Components/TopbarDisplayUser.razor
@@ -18,7 +18,7 @@
 <AuthorizeView>
     <Authorized>
         <div class="d-print-none">
-            @context.User.Identity?.Name
+            <span style="font-size: 14px;">@context.User.Identity?.Name</span>
         </div>
     </Authorized>
 </AuthorizeView>
diff --git a/Wonky.Client/Shared/MainLayout.razor b/Wonky.Client/Shared/MainLayout.razor
index e221dabb..e061402d 100644
--- a/Wonky.Client/Shared/MainLayout.razor
+++ b/Wonky.Client/Shared/MainLayout.razor
@@ -16,14 +16,15 @@
 
 @inherits LayoutComponentBase
 @using Wonky.Client.Components
+@using Wonky.Entity.Configuration
+@using Microsoft.Extensions.Options
 
 <div class="page">
     <div class="sidebar d-print-none">
         <NavMenu/>
     </div>
     <main>
-        <div class="top-row px-4 d-print-none">
-            <AppVersion />
+        <div class="top-row px-4 d-print-none @(_app.Sandbox ? "sandbox" : "")">
             <AppSandbox />
             <TopbarNavigation/>
         </div>
@@ -36,3 +37,14 @@
         <BlazoredToasts Position="ToastPosition.TopRight"  Timeout="10" />
     </main>
 </div>
+
+@code{
+
+    [Inject] IOptions<AppInfo?>? AppInfo { get; set; }
+    private AppInfo? _app;
+    
+    protected override void OnInitialized()
+    {
+        _app = AppInfo?.Value;
+    }    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Shared/MainLayout.razor.css b/Wonky.Client/Shared/MainLayout.razor.css
index bf2ce085..6d992467 100644
--- a/Wonky.Client/Shared/MainLayout.razor.css
+++ b/Wonky.Client/Shared/MainLayout.razor.css
@@ -25,6 +25,7 @@ main {
 .sidebar {
     background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%);
 }
+
 .bar-system-date {
     color: #ffaa00;
     background-color: #0e0e0e;
@@ -36,6 +37,7 @@ main {
     font-size: 2rem;
     font-variant: all-petite-caps;
 }
+
 .top-row {
     color: #ffaa00;
     background-color: #0e0e0e;
@@ -63,6 +65,11 @@ main {
         text-overflow: ellipsis;
     }
 
+.sandbox {
+    color: black;
+    background-color: darkred;
+}
+    
 @media (max-width: 1024px) {
     
     .top-row:not(.auth) {