diff --git a/site/plugins/admin/templates/content/entries/move.html b/site/plugins/admin/templates/content/entries/move.html
index 7fec36db..47cfecc7 100644
--- a/site/plugins/admin/templates/content/entries/move.html
+++ b/site/plugins/admin/templates/content/entries/move.html
@@ -1,27 +1,27 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<div class="row">
-    <div class="col-md-6">
-        <form method="post" id="form">
-            {{ csrf() }}
-            <input type="hidden" name="entry_id_current" value="{{ entry_id_current }}">
-            <input type="hidden" name="entry_id_path_parent" value="{{ entry_id_path_parent }}">
-            <input type="hidden" name="entry_id_path_current" value="{{ entry_id_path_current }}">
-            <div class="form-group">
-                <label for="title">{{ tr('admin_parent_entry') }}</label>
-                <select class="form-control" name="parent_entry">
-                {% for key, value in entries_list %}
-                    {% if key != entry_id_path_current %}
-                        <option value="{{ key }}" {% if key == entry_id_path_parent %}selected{% endif %}>{{ value }}</option>
-                    {% endif %}
-                {% endfor %}
-                </select>
-            </div>
-            <div class="form-group">
-                <input type="submit" id="moveEntry" name="move_entry" value="{{ tr('admin_save') }}" class="buttonbtn-black btn-fill btn-wd">
-            </div>
-        </form>
+    <div class="flex">
+        <div class="w-full lg:w-3/12">
+            <form method="post" id="form">
+                {{ csrf() }}
+                <input type="hidden" name="entry_id_current" value="{{ entry_id_current }}">
+                <input type="hidden" name="entry_id_path_parent" value="{{ entry_id_path_parent }}">
+                <input type="hidden" name="entry_id_path_current" value="{{ entry_id_path_current }}">
+                <div class="form-group">
+                    <label for="title" class="form-control-title">{{ tr('admin_parent_entry') }}</label>
+                    <select class="form-control js-select" name="parent_entry">
+                        {% for key, value in entries_list %}
+                            {% if key != entry_id_path_current %}
+                                <option value="{{ key }}" {% if key == entry_id_path_parent %} selected="selected" {% endif %}>{{ value }}</option>
+                            {% endif %}
+                        {% endfor %}
+                    </select>
+                </div>
+                <div class="button-group">
+                    <input type="submit" id="moveEntry" name="move_entry" value="{{ tr('admin_save') }}" class="button mr-3">
+                </div>
+            </form>
+        </div>
     </div>
-</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/content/entries/rename.html b/site/plugins/admin/templates/content/entries/rename.html
index eca2a381..4d4ece9a 100644
--- a/site/plugins/admin/templates/content/entries/rename.html
+++ b/site/plugins/admin/templates/content/entries/rename.html
@@ -1,25 +1,25 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<div class="row">
-    <div class="col-md-6">
-        <form method="post" id="form">
-            {{ csrf() }}
+    <div class="flex">
+        <div class="w-full lg:w-3/12">
+            <form method="post" id="form">
+                {{ csrf() }}
 
-            <input type="hidden" name="entry_path_current" value="{{entry_path_current}}">
-            <input type="hidden" name="entry_parent" value="{{entry_parent}}">
-            <input type="hidden" name="name_current" value="{{name_current}}">
+                <input type="hidden" name="entry_path_current" value="{{entry_path_current}}">
+                <input type="hidden" name="entry_parent" value="{{entry_parent}}">
+                <input type="hidden" name="name_current" value="{{name_current}}">
 
-            <div class="form-group">
-                <label for="entryName">{{ tr('admin_name') }}</label>
-                <input type="text" id="entryName" name="name" value="{{name_current}}" class="form-control" required="required" data-validation="length required" data-validation-allowing = "-_" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_title_empty_input') }}">
-                <small>{{ tr('admin_help_text_for_entry_name') }}</small>
-            </div>
+                <div class="form-group">
+                    <label for="entryName" class="form-control-title">{{ tr('admin_name') }}</label>
+                    <input type="text" id="entryName" name="name" value="{{name_current}}" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_title_empty_input') }}" data-parsley-required="true">
+                    <small>{{ tr('admin_help_text_for_entry_name') }}</small>
+                </div>
 
-            <div class="form-group">
-                <input type="submit" id="renameEntry" name="rename_entry" value="{{ tr('admin_save') }}" class="buttonbtn-black btn-fill btn-wd">
-            </div>
-        </form>
+                <div class="button-group">
+                    <input type="submit" id="renameEntry" name="rename_entry" value="{{ tr('admin_save') }}" class="button mr-3">
+                </div>
+            </form>
+        </div>
     </div>
-</div>
-{% endblock %}
+{% 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 93458665..7117ffe4 100644
--- a/site/plugins/admin/templates/content/entries/type.html
+++ b/site/plugins/admin/templates/content/entries/type.html
@@ -1,24 +1,24 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<div class="row">
-    <div class="col-md-6">
-        <form method="post" id="form">
-            {{ csrf() }}
-            <input type="hidden" name="id" value="{{ id }}">
-            <div class="form-group">
-                <label for="title">{{ tr('admin_type') }}</label>
-                <select class="form-control" name="fieldset">
-                {% for key, value in fieldsets %}
-                    <option value="{{ key }}" {% if key == fieldset %}selected{% endif %}>{{ value }}</option>
-                {% endfor %}
-                </select>
-                <small>{{ tr('admin_help_text_for_entry_type') }}</small>
-            </div>
-            <div class="form-group">
-                <input type="submit" id="saveEntry" name="save_entry" value="{{ tr('admin_save') }}" class="buttonbtn-black btn-fill btn-wd">
-            </div>
-        </form>
+    <div class="flex">
+        <div class="w-full lg:w-3/12">
+            <form method="post" id="form">
+                {{ csrf() }}
+                <input type="hidden" name="id" value="{{ id }}">
+                <div class="form-group">
+                    <label for="title" class="form-control-title">{{ tr('admin_type') }}</label>
+                    <select class="form-control js-select" name="fieldset">
+                        {% for key, value in fieldsets %}
+                            <option value="{{ key }}" {% if key == fieldset %} selected="selected" {% endif %}>{{ value }}</option>
+                        {% endfor %}
+                    </select>
+                    <small>{{ tr('admin_help_text_for_entry_type') }}</small>
+                </div>
+                <div class="button-group">
+                    <input type="submit" id="saveEntry" name="save_entry" value="{{ tr('admin_save') }}" class="button mr-3">
+                </div>
+            </form>
+        </div>
     </div>
-</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file