diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php
index fc25a8cd..02e35be6 100644
--- a/site/plugins/admin/app/Controllers/FieldsetsController.php
+++ b/site/plugins/admin/app/Controllers/FieldsetsController.php
@@ -53,16 +53,14 @@ class FieldsetsController extends Controller
                             'fieldsets' => [
                                 'link' => $this->router->pathFor('admin.fieldsets.index'),
                                 'title' => __('admin_fieldsets'),
-                                'attributes' => ['class' => 'navbar-item active']
+                                'attributes' => ['class' => 'navbar-item']
                             ],
-                        ],
-            'buttons' => [
                             'fieldsets_add' => [
                                 'link' => $this->router->pathFor('admin.fieldsets.add'),
                                 'title' => __('admin_create_new_fieldset'),
-                                'attributes' => ['class' => 'float-right btn']
-                            ]
+                                'attributes' => ['class' => 'navbar-item active']
                             ]
+                        ],
         ]
         );
     }
@@ -145,7 +143,7 @@ class FieldsetsController extends Controller
                             'fieldsets' => [
                                 'link' => $this->router->pathFor('admin.fieldsets.index'),
                                 'title' => __('admin_fieldsets'),
-                                'attributes' => ['class' => 'navbar-item active']
+                                'attributes' => ['class' => 'navbar-item']
                             ],
                             'fieldsets_rename' => [
                                 'link' => $this->router->pathFor('admin.fieldsets.rename') . '?id=' . $request->getQueryParams()['id'],
diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php
index 8d175ce3..aeef6a1c 100644
--- a/site/plugins/admin/app/Controllers/SnippetsController.php
+++ b/site/plugins/admin/app/Controllers/SnippetsController.php
@@ -69,6 +69,11 @@ class SnippetsController extends Controller
                             'snippets' => [
                                 'link' => $this->router->pathFor('admin.snippets.index'),
                                 'title' => __('admin_snippets'),
+                                'attributes' => ['class' => 'navbar-item']
+                            ],
+                            'snippets_rename' => [
+                                'link' => $this->router->pathFor('admin.snippets.add'),
+                                'title' => __('admin_create_new_snippet'),
                                 'attributes' => ['class' => 'navbar-item active']
                             ],
                         ]
@@ -174,9 +179,14 @@ class SnippetsController extends Controller
             'menu_item' => 'snippets',
             'id_current' => $request->getQueryParams()['id'],
             'links' => [
-                            'templates' => [
+                            'snippets' => [
                                 'link' => $this->router->pathFor('admin.snippets.index'),
-                                'title' => __('admin_templates'),
+                                'title' => __('admin_snippets'),
+                                'attributes' => ['class' => 'navbar-item']
+                            ],
+                            'snippets_rename' => [
+                                'link' => $this->router->pathFor('admin.snippets.rename') . '?id=' . $request->getQueryParams()['id'],
+                                'title' => __('admin_rename'),
                                 'attributes' => ['class' => 'navbar-item active']
                             ],
                         ]
diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php
index a2af2996..cde2ba51 100644
--- a/site/plugins/admin/app/Controllers/TemplatesController.php
+++ b/site/plugins/admin/app/Controllers/TemplatesController.php
@@ -71,6 +71,11 @@ class TemplatesController extends Controller
                             'templates' => [
                                 'link' => $this->router->pathFor('admin.templates.index'),
                                 'title' => __('admin_templates'),
+                                'attributes' => ['class' => 'navbar-item']
+                            ],
+                            'templates_create' => [
+                                'link' => $this->router->pathFor('admin.templates.add'),
+                                'title' => __('admin_create_new_template'),
                                 'attributes' => ['class' => 'navbar-item active']
                             ],
                         ]
@@ -191,6 +196,11 @@ class TemplatesController extends Controller
                             'templates' => [
                                 'link' => $this->router->pathFor('admin.templates.index'),
                                 'title' => __('admin_templates'),
+                                'attributes' => ['class' => 'navbar-item']
+                            ],
+                            'templates_rename' => [
+                                'link' => $this->router->pathFor('admin.templates.rename') . '?id=' . $request->getQueryParams()['id'] . '&type=' . (($request->getQueryParams()['type'] && $request->getQueryParams()['type'] == 'partial') ? 'partial' : 'template'),
+                                'title' => __('admin_rename'),
                                 'attributes' => ['class' => 'navbar-item active']
                             ],
                         ]