diff --git a/LANCommander.UI/Components/BootstrapIcon.razor b/LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor
similarity index 92%
rename from LANCommander.UI/Components/BootstrapIcon.razor
rename to LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor
index 8500ce7b..e59befaf 100644
--- a/LANCommander.UI/Components/BootstrapIcon.razor
+++ b/LANCommander.UI/Components/BootstrapIcon/BootstrapIcon.razor
@@ -1,3 +1,5 @@
+@namespace LANCommander.UI.Components
+
 <span class="anticon" role="img">
     <svg focusable="false" width="@Width" height="@Height" fill="@Color">
         <use href="_content/LANCommander.UI/bootstrap-icons.svg#@Type"></use>
diff --git a/LANCommander.UI/Components/ByteSize.razor b/LANCommander.UI/Components/ByteSize/ByteSize.razor
similarity index 73%
rename from LANCommander.UI/Components/ByteSize.razor
rename to LANCommander.UI/Components/ByteSize/ByteSize.razor
index 892d02b3..cdef04ee 100644
--- a/LANCommander.UI/Components/ByteSize.razor
+++ b/LANCommander.UI/Components/ByteSize/ByteSize.razor
@@ -1,3 +1,5 @@
+@namespace LANCommander.UI.Components
+
 @ByteSizeLib.ByteSize.FromBytes(@Value).ToString()
 
 @code {
diff --git a/LANCommander.UI/Components/Chat.razor b/LANCommander.UI/Components/Chat/Chat.razor
similarity index 96%
rename from LANCommander.UI/Components/Chat.razor
rename to LANCommander.UI/Components/Chat/Chat.razor
index 217e9e63..7928fffb 100644
--- a/LANCommander.UI/Components/Chat.razor
+++ b/LANCommander.UI/Components/Chat/Chat.razor
@@ -2,6 +2,7 @@
 @using Microsoft.AspNetCore.Components.Authorization
 @inject Client Client
 @inject AuthenticationStateProvider AuthenticationStateProvider
+@namespace LANCommander.UI.Components
 
 <Button OnClick="StartThread">New Thread</Button>
 
diff --git a/LANCommander.UI/Components/Chat/ChatList.razor b/LANCommander.UI/Components/Chat/ChatList.razor
new file mode 100644
index 00000000..d5f88baa
--- /dev/null
+++ b/LANCommander.UI/Components/Chat/ChatList.razor
@@ -0,0 +1 @@
+@namespace LANCommander.UI.Components
\ No newline at end of file
diff --git a/LANCommander.UI/Components/ChatMessage.razor b/LANCommander.UI/Components/Chat/ChatMessage.razor
similarity index 76%
rename from LANCommander.UI/Components/ChatMessage.razor
rename to LANCommander.UI/Components/Chat/ChatMessage.razor
index 647eae5e..e19b811a 100644
--- a/LANCommander.UI/Components/ChatMessage.razor
+++ b/LANCommander.UI/Components/Chat/ChatMessage.razor
@@ -1,3 +1,5 @@
+@namespace LANCommander.UI.Components
+
 <p>
     @Content
 </p>
diff --git a/LANCommander.UI/Components/ChatMessageGroup.razor b/LANCommander.UI/Components/Chat/ChatMessageGroup.razor
similarity index 93%
rename from LANCommander.UI/Components/ChatMessageGroup.razor
rename to LANCommander.UI/Components/Chat/ChatMessageGroup.razor
index 4eba210d..125bb804 100644
--- a/LANCommander.UI/Components/ChatMessageGroup.razor
+++ b/LANCommander.UI/Components/Chat/ChatMessageGroup.razor
@@ -1,4 +1,5 @@
 @using System.Globalization
+@namespace LANCommander.UI.Components
 
 <Comment Author="@UserName" Datetime="@StartedOn.ToString(CultureInfo.CurrentCulture)">
     <ContentTemplate>
diff --git a/LANCommander.UI/Components/ChatThread.razor b/LANCommander.UI/Components/Chat/ChatThread.razor
similarity index 97%
rename from LANCommander.UI/Components/ChatThread.razor
rename to LANCommander.UI/Components/Chat/ChatThread.razor
index d8d5ccf1..fe5a3f13 100644
--- a/LANCommander.UI/Components/ChatThread.razor
+++ b/LANCommander.UI/Components/Chat/ChatThread.razor
@@ -2,6 +2,7 @@
 @using LANCommander.SDK
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @inject Client Client
+@namespace LANCommander.UI.Components
 
 <Flex Direction="FlexDirection.Vertical">
     <div style="flex-grow: 1;">
diff --git a/LANCommander.UI/Components/ChatList.razor b/LANCommander.UI/Components/ChatList.razor
deleted file mode 100644
index e69de29b..00000000
diff --git a/LANCommander.UI/Scripts/Chunk.ts b/LANCommander.UI/Components/ChunkUploader/Chunk.ts
similarity index 100%
rename from LANCommander.UI/Scripts/Chunk.ts
rename to LANCommander.UI/Components/ChunkUploader/Chunk.ts
diff --git a/LANCommander.UI/Components/ChunkUploader.razor b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor
similarity index 99%
rename from LANCommander.UI/Components/ChunkUploader.razor
rename to LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor
index e57f5222..b2ecfcf8 100644
--- a/LANCommander.UI/Components/ChunkUploader.razor
+++ b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor
@@ -4,6 +4,7 @@
 @inject NavigationManager Navigator
 @inject IJSRuntime JS
 @inject IMessageService MessageService
+@namespace LANCommander.UI.Components
 
 <div class="ant-upload ant-upload-select-text ant-upload-drag ant-upload-select chunk-uploader" data-status="@CurrentProgressStatus">
     <Progress Type="ProgressType.Circle" Percent="Progress" Status="@CurrentProgressStatus" Class="uploader-progress" />
diff --git a/LANCommander.UI/Styles/_chunk-uploader.scss b/LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor.scss
similarity index 100%
rename from LANCommander.UI/Styles/_chunk-uploader.scss
rename to LANCommander.UI/Components/ChunkUploader/ChunkUploader.razor.scss
diff --git a/LANCommander.UI/Scripts/UploadInitRequest.ts b/LANCommander.UI/Components/ChunkUploader/UploadInitRequest.ts
similarity index 100%
rename from LANCommander.UI/Scripts/UploadInitRequest.ts
rename to LANCommander.UI/Components/ChunkUploader/UploadInitRequest.ts
diff --git a/LANCommander.UI/Scripts/UploadInitResponse.ts b/LANCommander.UI/Components/ChunkUploader/UploadInitResponse.ts
similarity index 100%
rename from LANCommander.UI/Scripts/UploadInitResponse.ts
rename to LANCommander.UI/Components/ChunkUploader/UploadInitResponse.ts
diff --git a/LANCommander.UI/Scripts/Uploader.ts b/LANCommander.UI/Components/ChunkUploader/Uploader.ts
similarity index 100%
rename from LANCommander.UI/Scripts/Uploader.ts
rename to LANCommander.UI/Components/ChunkUploader/Uploader.ts
diff --git a/LANCommander.UI/Components/ErrorHandler.razor b/LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor
similarity index 98%
rename from LANCommander.UI/Components/ErrorHandler.razor
rename to LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor
index e0e59c2e..d4c0b48b 100644
--- a/LANCommander.UI/Components/ErrorHandler.razor
+++ b/LANCommander.UI/Components/ErrorHandler/ErrorHandler.razor
@@ -1,6 +1,6 @@
 @using Microsoft.JSInterop
 @inject IJSRuntime JS
-@inject NavigationManager NavigationManager
+@namespace LANCommander.UI.Components
 
 <ErrorBoundary>
     <ChildContent>
diff --git a/LANCommander.UI/Styles/_file-manager.scss b/LANCommander.UI/Components/FileManager/FileManager.razor.scss
similarity index 100%
rename from LANCommander.UI/Styles/_file-manager.scss
rename to LANCommander.UI/Components/FileManager/FileManager.razor.scss
diff --git a/LANCommander.UI/Components/HelpButton.razor b/LANCommander.UI/Components/HelpButton/HelpButton.razor
similarity index 94%
rename from LANCommander.UI/Components/HelpButton.razor
rename to LANCommander.UI/Components/HelpButton/HelpButton.razor
index 74ba928c..40bf5349 100644
--- a/LANCommander.UI/Components/HelpButton.razor
+++ b/LANCommander.UI/Components/HelpButton/HelpButton.razor
@@ -1,3 +1,5 @@
+@namespace LANCommander.UI.Components
+
 <Flex Gap="FlexGap.Middle" Align="FlexAlign.Center">
     @ChildContent
 
diff --git a/LANCommander.UI/Components/ScriptLoader.razor b/LANCommander.UI/Components/Loaders/ScriptLoader.razor
similarity index 63%
rename from LANCommander.UI/Components/ScriptLoader.razor
rename to LANCommander.UI/Components/Loaders/ScriptLoader.razor
index 6ae22594..97eef8bc 100644
--- a/LANCommander.UI/Components/ScriptLoader.razor
+++ b/LANCommander.UI/Components/Loaders/ScriptLoader.razor
@@ -1,3 +1,5 @@
-<script src="/_content/LANCommander.UI/bundle.js"></script>
+@namespace LANCommander.UI.Components
+
+<script src="/_content/LANCommander.UI/bundle.js"></script>
 <script src="/_content/PSC.Blazor.Components.MarkdownEditor/js/easymde.min.js"></script>
 <script src="/_content/PSD.Blazor.Components.MarkdownEditor/js/markdownEditor.js"></script>
\ No newline at end of file
diff --git a/LANCommander.UI/Components/Loaders/StylesheetLoader.razor b/LANCommander.UI/Components/Loaders/StylesheetLoader.razor
new file mode 100644
index 00000000..2aa9e904
--- /dev/null
+++ b/LANCommander.UI/Components/Loaders/StylesheetLoader.razor
@@ -0,0 +1,4 @@
+@namespace LANCommander.UI.Components
+
+<link rel="stylesheet" href="/_content/PSC.Blazor.Components.MarkdownEditor/css/markdowneditor.css" />
+<link rel="stylesheet" href="/_content/PSC.Blazor.Components.MarkdownEditor/css/easymde.min.css" />
\ No newline at end of file
diff --git a/LANCommander.UI/Components/LocalTime.razor b/LANCommander.UI/Components/LocalTime/LocalTime.razor
similarity index 98%
rename from LANCommander.UI/Components/LocalTime.razor
rename to LANCommander.UI/Components/LocalTime/LocalTime.razor
index 207ea7e1..6cf98a50 100644
--- a/LANCommander.UI/Components/LocalTime.razor
+++ b/LANCommander.UI/Components/LocalTime/LocalTime.razor
@@ -1,6 +1,7 @@
 @using LANCommander.UI.Providers
 @implements IDisposable
 @inject TimeProvider TimeProvider
+@namespace LANCommander.UI.Components
 
 @if (Value.HasValue && Value.Value != DateTime.MinValue)
 {
diff --git a/LANCommander.UI/Components/LocalTimeInitializer.razor b/LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor
similarity index 95%
rename from LANCommander.UI/Components/LocalTimeInitializer.razor
rename to LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor
index 4a37e4bf..c8666680 100644
--- a/LANCommander.UI/Components/LocalTimeInitializer.razor
+++ b/LANCommander.UI/Components/LocalTime/LocalTimeInitializer.razor
@@ -2,6 +2,7 @@
 @using Microsoft.JSInterop
 @inject TimeProvider TimeProvider
 @inject IJSRuntime JS
+@namespace LANCommander.UI.Components
 
 @code {
     protected override async Task OnAfterRenderAsync(bool firstRender)
diff --git a/LANCommander.UI/Scripts/TimeProvider.ts b/LANCommander.UI/Components/LocalTime/TimeProvider.ts
similarity index 100%
rename from LANCommander.UI/Scripts/TimeProvider.ts
rename to LANCommander.UI/Components/LocalTime/TimeProvider.ts
diff --git a/LANCommander.UI/Components/MonacoCodeEditor.cs b/LANCommander.UI/Components/MonacoCodeEditor/MonacoCodeEditor.cs
similarity index 100%
rename from LANCommander.UI/Components/MonacoCodeEditor.cs
rename to LANCommander.UI/Components/MonacoCodeEditor/MonacoCodeEditor.cs
diff --git a/LANCommander.UI/Components/SafeImage.razor b/LANCommander.UI/Components/SafeImage/SafeImage.razor
similarity index 91%
rename from LANCommander.UI/Components/SafeImage.razor
rename to LANCommander.UI/Components/SafeImage/SafeImage.razor
index 82f77aef..770c2172 100644
--- a/LANCommander.UI/Components/SafeImage.razor
+++ b/LANCommander.UI/Components/SafeImage/SafeImage.razor
@@ -1,7 +1,8 @@
 @using LANCommander.SDK.Models
 @inject SDK.Client Client
+@namespace LANCommander.UI.Components
 
-<Spin Spinning="_loading">
+<Spin Spinning="_loading" WrapperClassName="@Class safe-image">
     @if (!_error)
     {
         if (!String.IsNullOrWhiteSpace(Source))
diff --git a/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss b/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss
new file mode 100644
index 00000000..666f7510
--- /dev/null
+++ b/LANCommander.UI/Components/SafeImage/SafeImage.razor.scss
@@ -0,0 +1,9 @@
+.safe-image {
+    & > div,
+    .ant-spin-container,
+    img {
+        display: inline-block;
+        max-width: 100%;
+        max-height: 100%;
+    }
+}
\ No newline at end of file
diff --git a/LANCommander.UI/Components/Pane.razor b/LANCommander.UI/Components/SplitPane/Pane.razor
similarity index 76%
rename from LANCommander.UI/Components/Pane.razor
rename to LANCommander.UI/Components/SplitPane/Pane.razor
index 8859b324..717f28f7 100644
--- a/LANCommander.UI/Components/Pane.razor
+++ b/LANCommander.UI/Components/SplitPane/Pane.razor
@@ -1,4 +1,6 @@
-<div class="pane @Class" data-size="@Size">
+@namespace LANCommander.UI.Components
+
+<div class="pane @Class" data-size="@Size">
     @ChildContent
 </div>
 
diff --git a/LANCommander.UI/Components/SplitPane.razor b/LANCommander.UI/Components/SplitPane/SplitPane.razor
similarity index 94%
rename from LANCommander.UI/Components/SplitPane.razor
rename to LANCommander.UI/Components/SplitPane/SplitPane.razor
index a0d6cf36..b262d494 100644
--- a/LANCommander.UI/Components/SplitPane.razor
+++ b/LANCommander.UI/Components/SplitPane/SplitPane.razor
@@ -1,5 +1,6 @@
 @using Microsoft.JSInterop
 @inject IJSRuntime JS
+@namespace LANCommander.UI.Components
 
 <CascadingValue Value="this" IsFixed="@true">
     <div id="split-pane-@(PaneId.ToString())" class="split-pane @Class" style="@Style">
diff --git a/LANCommander.UI/Scripts/SplitPane.ts b/LANCommander.UI/Components/SplitPane/SplitPane.ts
similarity index 95%
rename from LANCommander.UI/Scripts/SplitPane.ts
rename to LANCommander.UI/Components/SplitPane/SplitPane.ts
index 67f2cebc..1ff11cf9 100644
--- a/LANCommander.UI/Scripts/SplitPane.ts
+++ b/LANCommander.UI/Components/SplitPane/SplitPane.ts
@@ -1,4 +1,4 @@
-import Split from 'split.js'
+import Split from 'split.js'
 
 export class SplitPane {
     SplitPanes: HTMLElement[] = [];
diff --git a/LANCommander.UI/Styles/_split-pane.scss b/LANCommander.UI/Components/SplitPane/_split-pane.scss
similarity index 100%
rename from LANCommander.UI/Styles/_split-pane.scss
rename to LANCommander.UI/Components/SplitPane/_split-pane.scss
diff --git a/LANCommander.UI/Components/StylesheetLoader.razor b/LANCommander.UI/Components/StylesheetLoader.razor
deleted file mode 100644
index c29493ec..00000000
--- a/LANCommander.UI/Components/StylesheetLoader.razor
+++ /dev/null
@@ -1,2 +0,0 @@
-<link rel="stylesheet" href="/_content/PSC.Blazor.Components.MarkdownEditor/css/markdowneditor.css" />
-<link rel="stylesheet" href="/_content/PSC.Blazor.Components.MarkdownEditor/css/easymde.min.css" />
\ No newline at end of file
diff --git a/LANCommander.UI/Components/TagsInput.razor b/LANCommander.UI/Components/TagsInput/TagsInput.razor
similarity index 73%
rename from LANCommander.UI/Components/TagsInput.razor
rename to LANCommander.UI/Components/TagsInput/TagsInput.razor
index 4d06aa9d..89fa5cbc 100644
--- a/LANCommander.UI/Components/TagsInput.razor
+++ b/LANCommander.UI/Components/TagsInput/TagsInput.razor
@@ -1,12 +1,14 @@
 @using LANCommander.SDK.Models
 @typeparam TItem where TItem : IKeyedModel
+@namespace LANCommander.UI.Components
 
 <Select 
     @ref="@Select"
-    Mode="SelectMode.Multiple"
+    Mode="SelectMode.Tags"
     DataSource="Entities"
     ItemValue="e => e.Id"
     ItemLabel="OptionLabelSelector"
+    OnCreateCustomTag="async (tag) => await OnCreateCustomTag(tag)"
     @bind-Values="@SelectedValues"
     EnableSearch
     EnableVirtualization>
@@ -15,6 +17,8 @@
 @code {
     [Parameter] public Func<TItem, string> OptionLabelSelector { get; set; }
     [Parameter] public IEnumerable<TItem> Entities { get; set; }
+    
+    [Parameter] public EventCallback<string> OnCreateTag { get; set; }
 
     [Parameter] public ICollection<TItem> Values { get; set; }
     [Parameter] public EventCallback<ICollection<TItem>> ValuesChanged { get; set; }
@@ -38,4 +42,10 @@
             }
         }
     }
+
+    private async Task OnCreateCustomTag(string tag)
+    {
+        if (OnCreateTag.HasDelegate)
+            await OnCreateTag.InvokeAsync(tag);
+    }
 }
diff --git a/LANCommander.UI/Main.ts b/LANCommander.UI/Main.ts
index 1bdd07a0..89c194fc 100644
--- a/LANCommander.UI/Main.ts
+++ b/LANCommander.UI/Main.ts
@@ -1,6 +1,6 @@
-import { Uploader } from "./Scripts/Uploader"
-import { SplitPane } from "./Scripts/SplitPane"
-import { TimeProvider } from "./Scripts/TimeProvider";
+import { Uploader } from "./Components/ChunkUploader/Uploader"
+import { SplitPane } from "./Components/SplitPane/SplitPane"
+import { TimeProvider } from "./Components/LocalTime/TimeProvider";
 import { Readline } from "xterm-readline"
 import { FitAddon } from "@xterm/addon-fit"
 
diff --git a/LANCommander.UI/Styles/ui.scss b/LANCommander.UI/Styles/ui.scss
deleted file mode 100644
index ee9387f2..00000000
--- a/LANCommander.UI/Styles/ui.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use '_blazor-error';
-@use '_layout';
-@use '_panel-layout';
-@use '_menu';
-@use '_file-manager';
-@use '_chunk-uploader';
-@use '_pdf-reader';
-@use '_transfer';
-@use '_split-pane';
-@use '_markdown-editor';
-@use '_authentication-provider';
\ No newline at end of file
diff --git a/LANCommander.UI/_Imports.razor.scss b/LANCommander.UI/_Imports.razor.scss
new file mode 100644
index 00000000..37196fcc
--- /dev/null
+++ b/LANCommander.UI/_Imports.razor.scss
@@ -0,0 +1,12 @@
+@forward 'Styles/_blazor-error';
+@forward 'Styles/_layout';
+@forward 'Styles/_panel-layout';
+@forward 'Styles/_menu';
+@forward 'Styles/_pdf-reader';
+@forward 'Styles/_transfer';
+@forward 'Styles/_markdown-editor';
+@forward 'Styles/_authentication-provider';
+@forward 'Components/FileManager/FileManager.razor';
+@forward 'Components/ChunkUploader/ChunkUploader.razor';
+@forward 'Components/SplitPane/SplitPane.razor';
+@forward 'Components/SafeImage/SafeImage.razor';
diff --git a/LANCommander.UI/webpack.config.js b/LANCommander.UI/webpack.config.js
index c7f2653c..fe262d04 100644
--- a/LANCommander.UI/webpack.config.js
+++ b/LANCommander.UI/webpack.config.js
@@ -3,7 +3,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-    entry: ['./Main.ts', './Styles/ui.scss'], // Adjust the path if your index.js is located elsewhere
+    entry: ['./Main.ts', './_Imports.razor.scss'], // Adjust the path if your index.js is located elsewhere
     module: {
         rules: [
             {