diff --git a/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor b/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
index 5324e66..3c5e6eb 100644
--- a/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
+++ b/DbFirst.BlazorWebApp/Components/CatalogsGrid.razor
@@ -27,7 +27,7 @@ else
     <div class="band-editor">
         <button class="band-editor-toggle" @onclick="() => bandEditorExpanded = !bandEditorExpanded">
             <span class="band-editor-toggle-icon @(bandEditorExpanded ? "expanded" : "")">&#9658;</span>
-            <span>Band-Layout konfigurieren</span>
+            <span>Layout</span>
         </button>
         @if (bandEditorExpanded)
         {
diff --git a/DbFirst.BlazorWebApp/Components/MassDataGrid.razor b/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
index db7eb27..5cf80e0 100644
--- a/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
+++ b/DbFirst.BlazorWebApp/Components/MassDataGrid.razor
@@ -24,22 +24,11 @@ else if (items.Count == 0)
 }
 else
 {
-    <div class="mb-3 page-size-selector">
-        <span class="page-size-label">Datensätze je Seite:</span>
-        <DxComboBox Data="@pageSizeOptions"
-                    TData="PageSizeOption"
-                    TValue="int?"
-                    TextFieldName="Text"
-                    ValueFieldName="Value"
-                    Value="@pageSize"
-                    ValueChanged="OnPageSizeChanged"
-                    CssClass="page-size-combo" />
-    </div>
-
+    
     <div class="band-editor">
         <button class="band-editor-toggle" @onclick="() => bandEditorExpanded = !bandEditorExpanded">
             <span class="band-editor-toggle-icon @(bandEditorExpanded ? "expanded" : "")">&#9658;</span>
-            <span>Band-Layout konfigurieren</span>
+            <span>Layout</span>
         </button>
         @if (bandEditorExpanded)
         {
@@ -75,6 +64,18 @@ else
         }
     </div>
 
+    <div class="mb-3 page-size-selector">
+        <span class="page-size-label">Datensätze je Seite:</span>
+        <DxComboBox Data="@pageSizeOptions"
+                    TData="PageSizeOption"
+                    TValue="int?"
+                    TextFieldName="Text"
+                    ValueFieldName="Value"
+                    Value="@pageSize"
+                    ValueChanged="OnPageSizeChanged"
+                    CssClass="page-size-combo" />
+    </div>
+
     <div class="grid-section">
         <DxGrid Data="@items"
                 TItem="MassDataReadDto"