diff --git a/DbFirst.BlazorWasm/Pages/Catalogs.razor b/DbFirst.BlazorWasm/Pages/Catalogs.razor
index 964fe44..72e174a 100644
--- a/DbFirst.BlazorWasm/Pages/Catalogs.razor
+++ b/DbFirst.BlazorWasm/Pages/Catalogs.razor
@@ -1,6 +1,11 @@
 @page "/catalogs"
 @inject CatalogApiClient Api
 
+<style>
+    .action-panel { margin-bottom: 16px; }
+    .grid-section { margin-top: 12px; }
+</style>
+
 <PageTitle>Catalogs</PageTitle>
 
 <h1>Catalogs</h1>
@@ -20,31 +25,33 @@ else if (!string.IsNullOrWhiteSpace(infoMessage))
 
 @if (showForm)
 {
-    <EditForm Model="formModel" OnValidSubmit="HandleSubmit" Context="editCtx">
-        <DxFormLayout ColCount="2">
-            <DxFormLayoutItem Caption="Titel" Context="itemCtx">
-                <DxTextBox @bind-Text="formModel.CatTitle" Enabled="@(isEditing ? formModel.UpdateProcedure != 0 : true)" />
-            </DxFormLayoutItem>
-            <DxFormLayoutItem Caption="Kennung" Context="itemCtx">
-                <DxTextBox @bind-Text="formModel.CatString" />
-            </DxFormLayoutItem>
-            @if (isEditing)
-            {
-                <DxFormLayoutItem Caption="Update-Prozedur" Context="itemCtx">
-                    <DxComboBox Data="@procedureOptions"
-                                TextFieldName="Text"
-                                ValueFieldName="Value"
-                                @bind-Value="formModel.UpdateProcedure" />
+    <div class="action-panel">
+        <EditForm Model="formModel" OnValidSubmit="HandleSubmit" Context="editCtx">
+            <DxFormLayout ColCount="2">
+                <DxFormLayoutItem Caption="Titel" Context="itemCtx">
+                    <DxTextBox @bind-Text="formModel.CatTitle" Enabled="@(isEditing ? formModel.UpdateProcedure != 0 : true)" />
                 </DxFormLayoutItem>
-            }
-            <DxFormLayoutItem Caption=" " Context="itemCtx">
-                <DxStack Orientation="Orientation.Horizontal" Spacing="8">
-                    <DxButton RenderStyle="ButtonRenderStyle.Success" ButtonType="ButtonType.Submit" SubmitFormOnClick="true" Context="btnCtx">@((isEditing ? "Speichern" : "Anlegen"))</DxButton>
-                    <DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="@CancelEdit" Context="btnCtx">Abbrechen</DxButton>
-                </DxStack>
-            </DxFormLayoutItem>
-        </DxFormLayout>
-    </EditForm>
+                <DxFormLayoutItem Caption="Kennung" Context="itemCtx">
+                    <DxTextBox @bind-Text="formModel.CatString" />
+                </DxFormLayoutItem>
+                @if (isEditing)
+                {
+                    <DxFormLayoutItem Caption="Update-Prozedur" Context="itemCtx">
+                        <DxComboBox Data="@procedureOptions"
+                                    TextFieldName="Text"
+                                    ValueFieldName="Value"
+                                    @bind-Value="formModel.UpdateProcedure" />
+                    </DxFormLayoutItem>
+                }
+                <DxFormLayoutItem Caption=" " Context="itemCtx">
+                    <DxStack Orientation="Orientation.Horizontal" Spacing="8">
+                        <DxButton RenderStyle="ButtonRenderStyle.Success" ButtonType="ButtonType.Submit" SubmitFormOnClick="true" Context="btnCtx">@((isEditing ? "Speichern" : "Anlegen"))</DxButton>
+                        <DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="@CancelEdit" Context="btnCtx">Abbrechen</DxButton>
+                    </DxStack>
+                </DxFormLayoutItem>
+            </DxFormLayout>
+        </EditForm>
+    </div>
 }
 
 @if (isLoading)
@@ -57,26 +64,28 @@ else if (items.Count == 0)
 }
 else
 {
-    <DxGrid Data="@items" TItem="CatalogReadDto" KeyFieldName="@nameof(CatalogReadDto.Guid)" ShowFilterRow="true" PageSize="10" CssClass="mb-4">
-        <Columns>
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.Guid)" Caption="Id" Width="140px" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.CatTitle)" Caption="Titel" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.CatString)" Caption="String" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWho)" Caption="Angelegt von" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWhen)" Caption="Angelegt am" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWho)" Caption="Geändert von" />
-            <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWhen)" Caption="Geändert am" />
-            <DxGridDataColumn Caption="" Width="220px">
-                <CellDisplayTemplate Context="cell">
-                    @{ var item = (CatalogReadDto)cell.DataItem; }
-                    <div style="white-space: nowrap;">
-                        <DxButton RenderStyle="ButtonRenderStyle.Secondary" Size="ButtonSize.Small" Click="@(() => StartEdit(item))">Bearbeiten</DxButton>
-                        <DxButton RenderStyle="ButtonRenderStyle.Danger" Size="ButtonSize.Small" Click="@(() => DeleteCatalog(item.Guid))">Löschen</DxButton>
-                    </div>
-                </CellDisplayTemplate>
-            </DxGridDataColumn>
-        </Columns>
-    </DxGrid>
+    <div class="grid-section">
+        <DxGrid Data="@items" TItem="CatalogReadDto" KeyFieldName="@nameof(CatalogReadDto.Guid)" ShowFilterRow="true" PageSize="10" CssClass="mb-4">
+            <Columns>
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.Guid)" Caption="Id" Width="140px" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.CatTitle)" Caption="Titel" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.CatString)" Caption="String" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWho)" Caption="Angelegt von" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.AddedWhen)" Caption="Angelegt am" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWho)" Caption="Geändert von" />
+                <DxGridDataColumn FieldName="@nameof(CatalogReadDto.ChangedWhen)" Caption="Geändert am" />
+                <DxGridDataColumn Caption="" Width="220px">
+                    <CellDisplayTemplate Context="cell">
+                        @{ var item = (CatalogReadDto)cell.DataItem; }
+                        <div style="white-space: nowrap;">
+                            <DxButton RenderStyle="ButtonRenderStyle.Secondary" Size="ButtonSize.Small" Click="@(() => StartEdit(item))">Bearbeiten</DxButton>
+                            <DxButton RenderStyle="ButtonRenderStyle.Danger" Size="ButtonSize.Small" Click="@(() => DeleteCatalog(item.Guid))">Löschen</DxButton>
+                        </div>
+                    </CellDisplayTemplate>
+                </DxGridDataColumn>
+            </Columns>
+        </DxGrid>
+    </div>
 }
 
 @code {