diff --git a/site/plugins/admin/templates/content/entries/add.html b/site/plugins/admin/templates/content/entries/add.html
index 83e2e53d..780bc83c 100644
--- a/site/plugins/admin/templates/content/entries/add.html
+++ b/site/plugins/admin/templates/content/entries/add.html
@@ -1,12 +1,13 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-    <form method="post" id="form">
-        {{ csrf() }}
-        <input type="hidden" id="current_id" name="current_id" value="{{ current_id }}">
-        <input type="hidden" id="fieldset" name="fieldset" value="{{ type }}">
-        <div class="row">
-            <div class="col-md-6">
+    <div class="flex row">
+        <div class="col w-full lg:w-4/12">
+            <form method="post" id="form">
+                {{ csrf() }}
+                <input type="hidden" id="current_id" name="current_id" value="{{ current_id }}">
+                <input type="hidden" id="fieldset" name="fieldset" value="{{ type }}">
+
                 <div class="form-group">
                     <label for="title">{{ tr('admin_title') }}</label>
                     <input type="text" id="title" name="title" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_title_empty_input') }}">
@@ -17,20 +18,20 @@
                     <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
                     <small>{{ tr('admin_help_text_for_entry_name') }}</small>
                 </div>
-                <div class="row">
-                    <div class="col-md-6">
+                <div class="flex row">
+                    <div class="col w-full lg:w-6/12">
                         <div class="form-group">
                             <label>{{ tr('admin_routable') }}</label>
-                            <select class="form-control" name="routable">
+                            <select class="form-control js-select" name="routable">
                                 <option value="1" selected="selected">{{ tr('admin_yes') }}</option>
                                 <option value="0">{{ tr('admin_no') }}</option>
                             </select>
                         </div>
                     </div>
-                    <div class="col-md-6">
+                    <div class="col w-full lg:w-6/12">
                         <div class="form-group">
                             <label>{{ tr('admin_visibility') }}</label>
-                            <select class="form-control" name="visibility">
+                            <select class="form-control js-select" name="visibility">
                                 <option value="visible" selected="selected">{{ tr('admin_visible') }}</option>
                                 <option value="hidden">{{ tr('admin_hidden') }}</option>
                                 <option value="draft">{{ tr('admin_draft') }}</option>
@@ -38,18 +39,19 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group">
-                    <div class="btn-group custom-btn-group">
-                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="buttonbtn-black">
-                        <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <span class="sr-only">Toggle Dropdown</span>
-                        </button>
-                        <div class="dropdown">
-                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
-                        </div>
+                <div class="btn-group custom-btn-group">
+                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                    <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <span class="sr-only">Toggle Dropdown</span>
+                    </button>
+                    <div class="dropdown">
+                        <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
                     </div>
                 </div>
             </div>
         </div>
-    </form>
+    </div>
+</form>
+</div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/content/entries/move.html b/site/plugins/admin/templates/content/entries/move.html
index 47cfecc7..ffa15e45 100644
--- a/site/plugins/admin/templates/content/entries/move.html
+++ b/site/plugins/admin/templates/content/entries/move.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="flex">
-        <div class="w-full lg:w-3/12">
+        <div class="w-full lg:w-4/12">
             <form method="post" id="form">
                 {{ csrf() }}
                 <input type="hidden" name="entry_id_current" value="{{ entry_id_current }}">
diff --git a/site/plugins/admin/templates/content/entries/rename.html b/site/plugins/admin/templates/content/entries/rename.html
index 4d4ece9a..40e700c6 100644
--- a/site/plugins/admin/templates/content/entries/rename.html
+++ b/site/plugins/admin/templates/content/entries/rename.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="flex">
-        <div class="w-full lg:w-3/12">
+        <div class="w-full lg:w-4/12">
             <form method="post" id="form">
                 {{ csrf() }}
 
diff --git a/site/plugins/admin/templates/content/entries/source.html b/site/plugins/admin/templates/content/entries/source.html
index 1ba2b9d6..b771cd79 100644
--- a/site/plugins/admin/templates/content/entries/source.html
+++ b/site/plugins/admin/templates/content/entries/source.html
@@ -1,16 +1,12 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="action" value="save-form">
-    <input type="hidden" name="id" value="{{ id }}">
-    <div class="row">
-        <div class="col-12">
-            <div class="form-group">
-                <textarea  name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ data }}</textarea>
-            </div>
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="action" value="save-form">
+        <input type="hidden" name="id" value="{{ id }}">
+        <div class="form-group">
+            <textarea name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ data }}</textarea>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/content/entries/type.html b/site/plugins/admin/templates/content/entries/type.html
index 7117ffe4..6f85aed1 100644
--- a/site/plugins/admin/templates/content/entries/type.html
+++ b/site/plugins/admin/templates/content/entries/type.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="flex">
-        <div class="w-full lg:w-3/12">
+        <div class="w-full lg:w-4/12">
             <form method="post" id="form">
                 {{ csrf() }}
                 <input type="hidden" name="id" value="{{ id }}">
diff --git a/site/plugins/admin/templates/extends/fieldsets/add.html b/site/plugins/admin/templates/extends/fieldsets/add.html
index 22f95bfb..55ec9c28 100644
--- a/site/plugins/admin/templates/extends/fieldsets/add.html
+++ b/site/plugins/admin/templates/extends/fieldsets/add.html
@@ -3,8 +3,8 @@
 {% block content %}
     <form method="post" id="form">
         {{ csrf() }}
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="title" class="form-control-title">{{ tr('admin_title') }}</label>
                     <input type="text" id="title" name="title" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_title_empty_input') }}">
@@ -15,18 +15,24 @@
                     <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
                     <small>{{ tr('admin_help_text_for_fieldsets_name') }}</small>
                 </div>
-                <div class="form-group">
-                    <label for="icon" class="form-control-title">{{ tr('admin_icon') }}</label>
-                    <input type="text" id="fieldsetIcon" name="icon" value="far fa-file-alt" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_icon_empty_input') }}">
-                    <small>{{ tr('admin_help_text_for_fieldsets_icon', {':link': '<a href="https://fontawesome.com/icons?d=gallery&m=free" target="_blank">fontawesome</a>'})|raw }}</small>
-                </div>
-                <div class="form-group">
-                    <label for="icon" class="form-control-title">{{ tr('admin_hide') }}</label>
-                    <select class="js-example-basic-single form-control" id="fieldsetHide" name="hide">
-                        <option value="1">{{ tr('admin_yes') }}</option>
-                        <option value="0" selected="selected">{{ tr('admin_no') }}</option>
-                    </select>
-                    <small>{{ tr('admin_help_text_for_fieldsets_hide') }}</small>
+                <div class="flex row">
+                    <div class="col w-full lg:w-6/12">
+                        <div class="form-group">
+                            <label for="icon" class="form-control-title">{{ tr('admin_icon') }}</label>
+                            <input type="text" id="fieldsetIcon" name="icon" value="far fa-file-alt" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_icon_empty_input') }}">
+                            <small>{{ tr('admin_help_text_for_fieldsets_icon', {':link': '<a href="https://fontawesome.com/icons?d=gallery&m=free" target="_blank">fontawesome</a>'})|raw }}</small>
+                        </div>
+                    </div>
+                    <div class="col w-full lg:w-6/12">
+                        <div class="form-group">
+                            <label for="icon" class="form-control-title">{{ tr('admin_hide') }}</label>
+                            <select class="js-select form-control" id="fieldsetHide" name="hide">
+                                <option value="1">{{ tr('admin_yes') }}</option>
+                                <option value="0" selected="selected">{{ tr('admin_no') }}</option>
+                            </select>
+                            <small>{{ tr('admin_help_text_for_fieldsets_hide') }}</small>
+                        </div>
+                    </div>
                 </div>
                 <div class="button-group">
                     <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
diff --git a/site/plugins/admin/templates/extends/fieldsets/rename.html b/site/plugins/admin/templates/extends/fieldsets/rename.html
index 00ae3fa7..59ad8ea6 100644
--- a/site/plugins/admin/templates/extends/fieldsets/rename.html
+++ b/site/plugins/admin/templates/extends/fieldsets/rename.html
@@ -4,15 +4,17 @@
     <form method="post" id="form">
         {{ csrf() }}
         <input type="hidden" id="fieldset-id-current-{{ id }}" name="fieldset-id-current" value="{{ id }}">
-        <div class="w-full lg:w-3/12">
-            <div class="form-group">
-                <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                <input type="text" id="id" name="id" value="{{ id }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
-                <small>{{ tr('admin_help_text_for_fieldsets_name') }}</small>
-            </div>
-            <div class="form-group">
-                <input type="submit" id="renameFieldset" name="rename_fieldset" value="{{ tr('admin_save') }}" class="button">
+<div class="flex row">
+    <div class="col w-full lg:w-4/12">
+                <div class="form-group">
+                    <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
+                    <input type="text" id="id" name="id" value="{{ id }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <small>{{ tr('admin_help_text_for_fieldsets_name') }}</small>
+                </div>
+                <div class="button-group">
+                    <input type="submit" id="renameFieldset" name="rename_fieldset" value="{{ tr('admin_save') }}" class="button">
+                </div>
             </div>
         </div>
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/extends/snippets/add.html b/site/plugins/admin/templates/extends/snippets/add.html
index 61322051..ed9776c0 100644
--- a/site/plugins/admin/templates/extends/snippets/add.html
+++ b/site/plugins/admin/templates/extends/snippets/add.html
@@ -3,8 +3,8 @@
 {% block content %}
     <form method="post" id="form">
         {{ csrf() }}
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
                     <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
diff --git a/site/plugins/admin/templates/extends/snippets/rename.html b/site/plugins/admin/templates/extends/snippets/rename.html
index fa66aa17..fd7b60a8 100644
--- a/site/plugins/admin/templates/extends/snippets/rename.html
+++ b/site/plugins/admin/templates/extends/snippets/rename.html
@@ -4,8 +4,8 @@
     <form method="post" id="form">
         {{ csrf() }}
         <input type="hidden" name="id_current" value="{{ id_current }}">
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-3/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
                     <input type="text" id="id" name="id" value="{{ id_current }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
diff --git a/site/plugins/admin/templates/extends/themes/settings.html b/site/plugins/admin/templates/extends/themes/settings.html
index 3699d58a..6f3df360 100644
--- a/site/plugins/admin/templates/extends/themes/settings.html
+++ b/site/plugins/admin/templates/extends/themes/settings.html
@@ -5,12 +5,6 @@
         {{ csrf() }}
         <input type="hidden" id="action" name="action" value="save-form">
         <input type="hidden" id="id" name="id" value="{{ id }}">
-        <div class="row">
-            <div class="col-12">
-                <div class="form-group">
-                    <textarea name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ theme_settings }}</textarea>
-                </div>
-            </div>
-        </div>
+        <textarea name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ theme_settings }}</textarea>
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/add.html b/site/plugins/admin/templates/extends/themes/templates/add.html
index a2fea363..1c959597 100644
--- a/site/plugins/admin/templates/extends/themes/templates/add.html
+++ b/site/plugins/admin/templates/extends/themes/templates/add.html
@@ -4,8 +4,8 @@
     <form method="post" id="form">
         {{ csrf() }}
         <input type="hidden" name="theme" value="{{ theme }}">
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
                     <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
diff --git a/site/plugins/admin/templates/extends/themes/templates/rename.html b/site/plugins/admin/templates/extends/themes/templates/rename.html
index 78e65f68..a728f613 100644
--- a/site/plugins/admin/templates/extends/themes/templates/rename.html
+++ b/site/plugins/admin/templates/extends/themes/templates/rename.html
@@ -6,8 +6,8 @@
         <input type="hidden" name="id_current" value="{{ id_current }}">
         <input type="hidden" name="type_current" value="{{ type_current }}">
         <input type="hidden" name="theme" value="{{ theme }}">
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
                     <input type="text" id="id" name="id" value="{{ id_current }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
diff --git a/site/plugins/admin/templates/system/api/delivery/add.html b/site/plugins/admin/templates/system/api/delivery/add.html
index e99c8ad2..79f7aacf 100644
--- a/site/plugins/admin/templates/system/api/delivery/add.html
+++ b/site/plugins/admin/templates/system/api/delivery/add.html
@@ -4,8 +4,8 @@
     <form method="post" id="form" data-parsley-validate="data-parsley-validate">
         {{ csrf() }}
         <input type="hidden" name="api" value="{{ api }}">
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="title" class="form-control-title">{{ tr('admin_title') }}</label>
                     <input type="text" id="title" name="title" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_title_empty_input') }}" data-parsley-required="true">
diff --git a/site/plugins/admin/templates/system/api/delivery/edit.html b/site/plugins/admin/templates/system/api/delivery/edit.html
index 6800f203..98f8c1a1 100644
--- a/site/plugins/admin/templates/system/api/delivery/edit.html
+++ b/site/plugins/admin/templates/system/api/delivery/edit.html
@@ -9,8 +9,8 @@
         <input type="hidden" name="created_at" value="{{ api_token_data.created_at }}">
         <input type="hidden" name="uuid" value="{{ api_token_data.uuid }}">
         <input type="hidden" name="calls" value="{{ api_token_data.calls }}">
-        <div class="flex">
-            <div class="w-full lg:w-3/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="title" class="form-control-title">{{ tr('admin_title') }}</label>
                     <input type="text" id="title" name="title" value="{{ api_token_data.title }}" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_title_empty_input') }}" data-parsley-required="true">