diff --git a/admin.php b/admin.php
index 092eba60..38d9b72b 100644
--- a/admin.php
+++ b/admin.php
@@ -421,6 +421,10 @@ class AdminPlugin extends Plugin
             $locator = $this->grav['locator'];
 
             foreach ($plugins as $plugin) {
+                if ($this->config->get("plugins.{$plugin->name}.enabled") !== true) {
+                    continue;
+                }
+
                 $path = $locator->findResource("user://plugins/{$plugin->name}/admin/pages/{$self->template}.md");
 
                 if ($path) {
diff --git a/themes/grav/app/forms/form.js b/themes/grav/app/forms/form.js
index 81d1d5ea..17e9c963 100644
--- a/themes/grav/app/forms/form.js
+++ b/themes/grav/app/forms/form.js
@@ -37,8 +37,10 @@ export default class Form {
             $(global).on('keydown', function(event) {
                 var key = String.fromCharCode(event.which).toLowerCase();
                 if (((event.ctrlKey && !event.altKey) || event.metaKey) && key === 's') {
-                    event.preventDefault();
-                    saveTask.click();
+                    if (!event.shiftKey) {
+                        event.preventDefault();
+                        saveTask.click();
+                    }
                 }
             });
         }
diff --git a/themes/grav/scss/preset.scss b/themes/grav/scss/preset.scss
index c9268b94..c8f6c421 100644
--- a/themes/grav/scss/preset.scss
+++ b/themes/grav/scss/preset.scss
@@ -1566,5 +1566,9 @@ body .bootstrap-datetimepicker-widget {
     }
 }
 
+.permission-container {
+    overflow: hidden;
+}
+
 // Range-field
 @import "template/modules/input-range";
diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig
index 7b9079e6..d228219e 100644
--- a/themes/grav/templates/forms/fields/list/list.html.twig
+++ b/themes/grav/templates/forms/fields/list/list.html.twig
@@ -63,7 +63,7 @@
                     data-collection-nosort
                 {% endif %}>
                 {% if field.fields %}
-                {% set collapsible = field.fields|count > 1 and (field.collapsible is not defined or field.collapsible)  %}
+                {% set collapsible = field.fields|length > 1 and (field.collapsible is not defined or field.collapsible)  %}
                 {% for key, val in value %}
                     {% set itemName = name ? name ~ '.' ~ key : key %}
                     <li data-collection-item="{{ itemName }}" data-collection-key="{{ key }}" class="{{ not collapsible or field.collapsed ? 'collection-collapsed' : '' }}">
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 395e47d9..6f112f4e 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -122,7 +122,7 @@
 
             {% for key, add_modal in config.plugins.admin.add_modals %}
                 {% if add_modal.show_in|defined('bar') == 'bar' %}
-                    <a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}"><i class="fa fa-plus"></i> {{ add_modal.label }}</a>
+                    <a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}"><i class="fa fa-plus"></i> {{ add_modal.label|tu }}</a>
                 {% endif %}
             {% endfor %}
 
@@ -141,7 +141,7 @@
                     {% endif %}
                     {% for key, add_modal in config.plugins.admin.add_modals %}
                         {% if add_modal.show_in|defined('bar') == 'dropdown' %}
-                            <li><a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}">{{ add_modal.label }}</a></li>
+                            <li><a class="button {{ add_modal.link_classes }}" href="#modal-add_modal-{{ key }}" data-remodal-target="modal-add_modal-{{ key }}">{{ add_modal.label|tu }}</a></li>
                         {% endif %}
                     {% endfor %}
                 </ul>