diff --git a/dashmachine/main/routes.py b/dashmachine/main/routes.py
index 1dec488..0e6f70b 100755
--- a/dashmachine/main/routes.py
+++ b/dashmachine/main/routes.py
@@ -165,6 +165,8 @@ def load_settings_editor():
             json.loads(tag_json)
             for tag_json in settings_dict["tags"].replace("},{", "}%,%{").split("%,%")
         ]
+    else:
+        settings_dict["tags"] = ["list"] + [{"name": "", "icon": "", "sort_pos": ""}]
     settings_editor_html = render_template_string(
         """
         {% from 'main/settings-editor.html' import SettingsEditor with context %}
diff --git a/dashmachine/templates/global_macros.html b/dashmachine/templates/global_macros.html
index a819b2a..7ac4993 100644
--- a/dashmachine/templates/global_macros.html
+++ b/dashmachine/templates/global_macros.html
@@ -240,9 +240,9 @@ class=''
                 <input data-search-providers-url="{{ url_for('main.build_action_provider_url') }}"
                        type="text"
                        class="card-filter action-bar theme-surface-transparent"
-                       placeholder="Search apps" autofocus>
+                       placeholder="Search.." autofocus>
 
-                {% if True %}
+                {% if tags|length > 1 %}
                     <i class="toggle-tag-expand-all-btn material-icons right filter-action pointer">unfold_less</i>
                     <!-- Dropdown Trigger -->
                     <a class='dropdown-trigger filter-tags-dropdown-trigger' data-target='filter-tags-dropdown-{{ location }}'>
diff --git a/dashmachine/templates/main/settings-editor.html b/dashmachine/templates/main/settings-editor.html
index 0291102..0025952 100644
--- a/dashmachine/templates/main/settings-editor.html
+++ b/dashmachine/templates/main/settings-editor.html
@@ -14,7 +14,7 @@
 
     <div class="row">
         <div class="col s12 mb-2">
-            <ul class="tabs theme-background">
+            <ul class="tabs theme-background tabs-fixed-width">
                 {% if access_group.can_access_main_settings == "True"%}
                     <li class="tab col s3 active"><a id="settings-gui-tab" href="#settings-gui">
                         <i class="material-icons-outlined">settings</i>