diff --git a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor b/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor
index f08d308..f0bb54c 100644
--- a/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor	
+++ b/app/MindWork AI Studio/Components/Blocks/AssistantBlock.razor	
@@ -1,26 +1,24 @@
-<MudItem xs="3">
-    <MudCard Outlined="@true" Style="border-width: 2px; border-color: #0d47a1; border-radius: 12px; border-style: solid;">
-        <MudCardHeader>
-            <CardHeaderContent>
-                <MudStack AlignItems="AlignItems.Center" Row="@true">
-                    <MudIcon Icon="@this.Icon" Size="Size.Large" Color="Color.Primary"/>
-                    <MudText Typo="Typo.h6">
-                        @this.Name
-                    </MudText>
-                </MudStack>
-            </CardHeaderContent>
-        </MudCardHeader>
-        <MudCardContent>
-            <MudStack>
-                <MudText>
-                    @this.Description
+<MudCard Outlined="@true" Style="border-width: 2px; border-color: #0d47a1; border-radius: 12px; border-style: solid; max-width: 20em;">
+    <MudCardHeader>
+        <CardHeaderContent>
+            <MudStack AlignItems="AlignItems.Center" Row="@true">
+                <MudIcon Icon="@this.Icon" Size="Size.Large" Color="Color.Primary"/>
+                <MudText Typo="Typo.h6">
+                    @this.Name
                 </MudText>
             </MudStack>
-        </MudCardContent>
-        <MudCardActions>
-            <MudButton Size="Size.Large" Variant="Variant.Filled" StartIcon="@this.Icon" Color="Color.Default" Href="@this.Link">
-                @this.ButtonText
-            </MudButton>
-        </MudCardActions>
-    </MudCard>
-</MudItem>
\ No newline at end of file
+        </CardHeaderContent>
+    </MudCardHeader>
+    <MudCardContent>
+        <MudStack>
+            <MudText>
+                @this.Description
+            </MudText>
+        </MudStack>
+    </MudCardContent>
+    <MudCardActions>
+        <MudButton Size="Size.Large" Variant="Variant.Filled" StartIcon="@this.Icon" Color="Color.Default" Href="@this.Link">
+            @this.ButtonText
+        </MudButton>
+    </MudCardActions>
+</MudCard>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Pages/Assistants.razor b/app/MindWork AI Studio/Components/Pages/Assistants.razor
index bfb25c4..5df74a2 100644
--- a/app/MindWork AI Studio/Components/Pages/Assistants.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Assistants.razor	
@@ -4,9 +4,9 @@
     Assistants
 </MudText>
 
-<MudGrid>
+<MudStack Row="@true" Wrap="@Wrap.Wrap">
     <AssistantBlock Name="Icon Finder" Description="Using a LLM to find an icon for a given context." Icon="@Icons.Material.Filled.FindInPage" Link="/assistant/icons"/>
     <AssistantBlock Name="Text Summarizer" Description="Using a LLM to summarize a given text." Icon="@Icons.Material.Filled.TextSnippet" Link="/assistant/summarizer"/>
     <AssistantBlock Name="Translation" Description="Translate text into another language." Icon="@Icons.Material.Filled.Translate" Link="/assistant/translation"/>
     <AssistantBlock Name="Coding" Description="Get coding and debugging support from a LLM." Icon="@Icons.Material.Filled.Code" Link="/assistant/coding"/>
-</MudGrid>
\ No newline at end of file
+</MudStack>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.6.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.6.md
index 5949506..00280c0 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.8.6.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.6.md	
@@ -1,4 +1,5 @@
 # v0.8.6, build 168
 - Added possibility to configure a default provider for chats
 - Improved the readability of the `settings.json` file by using indentation and enum names instead of numbers
+- Improved assistant overview; assistants will now wrap to the next line if there are too many to fit on the row
 - Increased the default value for the live translation delay from 1,000 to 1,500 ms
\ No newline at end of file