diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor
index 930dcf8..afc1f46 100644
--- a/Components/Pages/Home.razor
+++ b/Components/Pages/Home.razor
@@ -21,15 +21,17 @@
                         <Dropdown>
                             <DropdownToggle> @group.GroupName </DropdownToggle>
                             <DropdownMenu>
-                                <Dropdown>
-                                    @foreach (var preset in group.Presets)
-                                    {
-                                        <DropdownItem @onclick="() => LoadPresetPublish(preset)">@preset.Name</DropdownItem>
-                                    }
-                                </Dropdown>
+                                @foreach (var preset in group.Presets)
+                                {
+                                    <DropdownItem @onclick="() => LoadPresetPublish(preset)">@preset.Name</DropdownItem>
+                                }
                             </DropdownMenu>
                         </Dropdown>
                     }
+                    @foreach (var preset in ungroupedPresets)
+                    {
+                        <DropdownItem @onclick="() => LoadPresetPublish(preset)">@preset.Name</DropdownItem>
+                    }
                 </DropdownMenu>
             </Dropdown>
         </div>
@@ -79,15 +81,17 @@
                         <Dropdown>
                             <DropdownToggle> @group.GroupName </DropdownToggle>
                             <DropdownMenu>
-                                <Dropdown>
-                                    @foreach (var preset in group.Presets)
-                                    {
-                                        <DropdownItem @onclick="() => LoadPresetSubscribe(preset)">@preset.Name</DropdownItem>
-                                    }
-                                </Dropdown>
+                                @foreach (var preset in group.Presets)
+                                {
+                                    <DropdownItem @onclick="() => LoadPresetSubscribe(preset)">@preset.Name</DropdownItem>
+                                }
                             </DropdownMenu>
                         </Dropdown>
                     }
+                    @foreach (var preset in ungroupedPresets)
+                    {
+                        <DropdownItem @onclick="() => LoadPresetSubscribe(preset)">@preset.Name</DropdownItem>
+                    }
                 </DropdownMenu>
             </Dropdown>
         </div>
@@ -153,12 +157,14 @@
     Dropdown pubPresetDropdown;
     Dropdown subPresetDropdown;
     private List<PresetGroupModel> presetGroups = new List<PresetGroupModel>();
+    private List<PresetModel> ungroupedPresets = new List<PresetModel>();
 
     private List<string> messages = new List<string>();
 
     protected override async Task OnInitializedAsync()
     {
         presetGroups = await PresetService.GetPresetGroupsAsync();
+        ungroupedPresets = await PresetService.GetUngroupedPresetsAsync();
     }
 
     private async Task LoadPresetPublish(PresetModel preset)
diff --git a/Components/Pages/QueueBrowser.razor b/Components/Pages/QueueBrowser.razor
index 8fe39b5..275beac 100644
--- a/Components/Pages/QueueBrowser.razor
+++ b/Components/Pages/QueueBrowser.razor
@@ -15,20 +15,22 @@
         <Dropdown @ref="presetDropdown">
             <DropdownToggle Color="Color.Primary">@selectedPreset</DropdownToggle>
             <DropdownMenu>
-                    @foreach (var group in presetGroups)
-                    {
+                @foreach (var group in presetGroups)
+                {
                     <Dropdown>
                         <DropdownToggle> @group.GroupName </DropdownToggle>
                         <DropdownMenu>
-                            <Dropdown>
-                                @foreach (var preset in group.Presets)
-                                {
-                                    <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
-                                }
-                            </Dropdown>
+                            @foreach (var preset in group.Presets)
+                            {
+                                <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
+                            }
                         </DropdownMenu>
                     </Dropdown>
-                    }
+                }
+                @foreach (var preset in ungroupedPresets)
+                {
+                    <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
+                }
             </DropdownMenu>
         </Dropdown>
     </div>
@@ -161,6 +163,7 @@
 
     private string selectedPreset = "Select Preset";
     private List<PresetGroupModel> presetGroups = new List<PresetGroupModel>();
+    private List<PresetModel> ungroupedPresets = new List<PresetModel>();
     Dropdown presetDropdown;
 
     private bool isBrowsing = false;
@@ -215,6 +218,7 @@
     protected override async Task OnInitializedAsync()
     {
         presetGroups = await PresetService.GetPresetGroupsAsync();
+        ungroupedPresets = await PresetService.GetUngroupedPresetsAsync();
     }
 
     protected override void OnInitialized()
diff --git a/Components/Pages/SEMP.razor b/Components/Pages/SEMP.razor
index 74679fa..531b971 100644
--- a/Components/Pages/SEMP.razor
+++ b/Components/Pages/SEMP.razor
@@ -22,15 +22,17 @@
                             <Dropdown>
                                 <DropdownToggle> @group.GroupName </DropdownToggle>
                                 <DropdownMenu>
-                                    <Dropdown>
-                                        @foreach (var preset in group.Presets)
-                                        {
-                                            <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
-                                        }
-                                    </Dropdown>
+                                    @foreach (var preset in group.Presets)
+                                    {
+                                        <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
+                                    }
                                 </DropdownMenu>
                             </Dropdown>
                         }
+                        @foreach (var preset in ungroupedPresets)
+                        {
+                            <DropdownItem @onclick="() => LoadPreset(preset)">@preset.Name</DropdownItem>
+                        }
                     </DropdownMenu>
                 </Dropdown>
             </div>
@@ -105,6 +107,7 @@
 
     private string selectedPreset = "Select Preset";
     private List<PresetGroupModel> presetGroups = new List<PresetGroupModel>();
+    private List<PresetModel> ungroupedPresets = new List<PresetModel>();
     Dropdown presetDropdown;
 
     private async Task GetQueues()
@@ -137,6 +140,7 @@
     protected override async Task OnInitializedAsync()
     {
         presetGroups = await PresetService.GetPresetGroupsAsync();
+        ungroupedPresets = await PresetService.GetUngroupedPresetsAsync();
     }
 
     private void LoadPreset(PresetModel preset)
diff --git a/README.md b/README.md
index e96d41b..1874504 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ The Solace Web Client is a .NET (C#) application that offers comprehensive funct
 
 ## Presets
 The Solace Web Client allows you to manage connection presets, making it easy to switch between different configurations.
+You can either create presets directly (i.e. Exampele 5) or group them (i.e. "test" & "prod").
 
 Create a presets.json and mount it in `/app/presets/presets.json`.
 
@@ -77,6 +78,16 @@ Example:
         "sempUsername": "admin"
       }
     ]
+  },
+  {
+    "Name": "Example 5",
+    "Host": "tcps://broker.domain:55443",
+    "VpnName": "default",
+    "Username": "demo",
+    "Topic": "a/b/c",
+    "QueueName": "myqueue",
+    "SempUrl": "https://broker.domain:1943",
+    "sempUsername": "admin"
   }
 ]
 
diff --git a/Services/PresetService.cs b/Services/PresetService.cs
index 2e763bf..ce26616 100644
--- a/Services/PresetService.cs
+++ b/Services/PresetService.cs
@@ -10,8 +10,9 @@ namespace SolaceWebClient.Services
     public class PresetGroupModel
     {
         public string GroupName { get; set; }
-        public List<PresetModel> Presets { get; set; }
+        public List<PresetModel> Presets { get; set; } = new List<PresetModel>(); // Initialisiere die Liste
     }
+
     public class PresetModel
     {
         public string Name { get; set; }
@@ -24,6 +25,12 @@ public class PresetModel
         public string sempUsername { get; set; }
     }
 
+    public class UngroupedPresetModel : PresetModel
+    {
+
+    }
+
+
     public class PresetService
     {
         private readonly string presetsFilePath = Path.Combine("presets", "presets.json");
@@ -36,9 +43,54 @@ public async Task<List<PresetGroupModel>> GetPresetGroupsAsync()
             }
 
             var json = await File.ReadAllTextAsync(presetsFilePath);
-            var presetGroups = JsonSerializer.Deserialize<List<PresetGroupModel>>(json);
+            var allPresets = JsonSerializer.Deserialize<List<JsonElement>>(json);
+
+            var groupedPresets = new List<PresetGroupModel>();
+            var ungroupedPresets = new List<PresetModel>();
+
+            foreach (var item in allPresets)
+            {
+                if (item.TryGetProperty("Presets", out _))
+                {
+                    var group = JsonSerializer.Deserialize<PresetGroupModel>(item.GetRawText());
+                    groupedPresets.Add(group);
+                }
+                else if (item.TryGetProperty("Name", out _))
+                {
+                    var preset = JsonSerializer.Deserialize<PresetModel>(item.GetRawText());
+                    ungroupedPresets.Add(preset);
+                }
+            }
+            return groupedPresets;
+        }
+
+        public async Task<List<PresetModel>> GetUngroupedPresetsAsync()
+        {
+            if (!File.Exists(presetsFilePath))
+            {
+                return new List<PresetModel>();
+            }
+
+            var json = await File.ReadAllTextAsync(presetsFilePath);
+            var allPresets = JsonSerializer.Deserialize<List<JsonElement>>(json);
+
+            var ungroupedPresets = new List<PresetModel>();
+
+            foreach (var item in allPresets)
+            {
+                if (item.TryGetProperty("Presets", out _))
+                {
+                    continue;
+                }
+
+                if (item.TryGetProperty("Name", out _))
+                {
+                    var preset = JsonSerializer.Deserialize<PresetModel>(item.GetRawText());
+                    ungroupedPresets.Add(preset);
+                }
+            }
 
-            return presetGroups ?? new List<PresetGroupModel>();
+            return ungroupedPresets;
         }
     }
 
diff --git a/presets/example.json b/presets/example.json
index 1f9316d..e31d4d4 100644
--- a/presets/example.json
+++ b/presets/example.json
@@ -46,5 +46,15 @@
         "sempUsername": "admin"
       }
     ]
+  },
+  {
+    "Name": "Example 5",
+    "Host": "tcps://broker.domain:55443",
+    "VpnName": "default",
+    "Username": "demo",
+    "Topic": "a/b/c",
+    "QueueName": "myqueue",
+    "SempUrl": "https://broker.domain:1943",
+    "sempUsername": "admin"
   }
-]
+]
\ No newline at end of file