diff --git a/src/ScadaLink.CentralUI/Components/Pages/Design/Templates.razor b/src/ScadaLink.CentralUI/Components/Pages/Design/Templates.razor
index 16d71d6..4a30f00 100644
--- a/src/ScadaLink.CentralUI/Components/Pages/Design/Templates.razor
+++ b/src/ScadaLink.CentralUI/Components/Pages/Design/Templates.razor
@@ -21,25 +21,25 @@
 
     <RenameFolderDialog @bind-IsVisible="_showRenameFolderDialog"
                         FolderId="_renameFolderId"
-                        InitialName="_renameFolderInitialName"
-                        ErrorMessage="_renameFolderError"
+                        InitialName="@_renameFolderInitialName"
+                        ErrorMessage="@_renameFolderError"
                         OnSubmit="SubmitRenameFolder" />
 
     <NewFolderDialog @bind-IsVisible="_showNewFolderDialog"
                      ParentFolderId="_newFolderParentId"
-                     ErrorMessage="_newFolderError"
+                     ErrorMessage="@_newFolderError"
                      OnSubmit="SubmitNewFolder" />
 
     <NewTemplateDialog @bind-IsVisible="_showNewTemplateDialog"
                        FolderId="_newTemplateFolderId"
-                       ErrorMessage="_newTemplateError"
+                       ErrorMessage="@_newTemplateError"
                        OnSubmit="SubmitNewTemplate" />
 
     <MoveTemplateDialog @bind-IsVisible="_showMoveTemplateDialog"
                         TemplateId="_moveTemplateId"
-                        TemplateName="_moveTemplateName"
+                        TemplateName="@_moveTemplateName"
                         FolderOptions="EnumerateFolderOptions()"
-                        ErrorMessage="_moveTemplateError"
+                        ErrorMessage="@_moveTemplateError"
                         OnSubmit="SubmitMoveTemplate" />
 
     @if (_loading)
@@ -54,16 +54,14 @@
     {
         <div class="row g-2">
             <div class="col-md-4 col-lg-3">
-                <div class="d-flex justify-content-between align-items-center mb-2">
-                    <h6 class="mb-0">Templates</h6>
-                    <div class="btn-group btn-group-sm">
-                        <button class="btn btn-outline-secondary" title="New folder at root"
-                                @onclick="() => OpenNewFolderDialog(null)">+ Folder</button>
-                        <button class="btn btn-outline-secondary" title="New template at root"
-                                @onclick="() => OpenNewTemplateDialog(null)">+ Template</button>
-                        <button class="btn btn-outline-secondary" @onclick="() => _tree.ExpandAll()">Expand</button>
-                        <button class="btn btn-outline-secondary" @onclick="() => _tree.CollapseAll()">Collapse</button>
-                    </div>
+                <h6 class="mb-2">Templates</h6>
+                <div class="btn-group btn-group-sm w-100 mb-2">
+                    <button class="btn btn-outline-secondary" title="New folder at root"
+                            @onclick="() => OpenNewFolderDialog(null)">+ Folder</button>
+                    <button class="btn btn-outline-secondary" title="New template at root"
+                            @onclick="() => OpenNewTemplateDialog(null)">+ Template</button>
+                    <button class="btn btn-outline-secondary" @onclick="() => _tree.ExpandAll()">Expand</button>
+                    <button class="btn btn-outline-secondary" @onclick="() => _tree.CollapseAll()">Collapse</button>
                 </div>
 
                 <div style="max-height: calc(100vh - 160px); overflow-y: auto;">