diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index a6473099..88963577 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -248,31 +248,15 @@
             {% endfor %}
         {% endfor %}
 
-
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.3.26/jquery.form-validator.min.js"></script>
+    {% include "plugins/admin/views/partials/form-validator.html" %}
+    {% include "plugins/admin/views/partials/messenger.html" %}
+    {% include "plugins/admin/views/partials/clipboard.html" %}
 
     <script type="text/javascript">
 
-            new ClipboardJS('.js-clipboard-btn');
+
             bsCustomFileInput.init();
 
-            Messenger.options = {
-                extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
-                theme: 'flat'
-            }
-
-            {% for message in flash()['success'] %}
-                Messenger().post({ type: "success", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
-            {% for message in flash()['warning'] %}
-                Messenger().post({ type: "warning", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
-            {% for message in flash()['error'] %}
-                Messenger().post({ type: "error", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
             $(document).ready(function() {
 
                 $.trumbowyg.svgPath =  '{{base_url()}}/site/plugins/admin/assets/dist/fonts/trumbowyg/icons.svg';
@@ -351,7 +335,6 @@
                     $('#settingsEntryModal').modal();
                 });
 
-                $.validate({});
                 {% if is_current_path('admin.fieldsets.edit') or is_current_path('admin.templates.edit') or is_current_path('admin.snippets.edit') or (is_current_path('admin.entries.edit') and type == 'source') %}
                 var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), {
                     lineNumbers: true,
diff --git a/site/plugins/admin/views/partials/clipboard.html b/site/plugins/admin/views/partials/clipboard.html
new file mode 100644
index 00000000..b546bf0b
--- /dev/null
+++ b/site/plugins/admin/views/partials/clipboard.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    new ClipboardJS('.js-clipboard-btn');
+</script>
diff --git a/site/plugins/admin/views/partials/form-validator.html b/site/plugins/admin/views/partials/form-validator.html
new file mode 100644
index 00000000..f425d15a
--- /dev/null
+++ b/site/plugins/admin/views/partials/form-validator.html
@@ -0,0 +1,4 @@
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.3.26/jquery.form-validator.min.js"></script>
+<script type="text/javascript">
+    $.validate({});
+</script>
diff --git a/site/plugins/admin/views/partials/messenger.html b/site/plugins/admin/views/partials/messenger.html
new file mode 100644
index 00000000..c04e3cac
--- /dev/null
+++ b/site/plugins/admin/views/partials/messenger.html
@@ -0,0 +1,18 @@
+<script type="text/javascript">
+    Messenger.options = {
+        extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
+        theme: 'flat'
+    }
+
+    {% for message in flash()['success'] %}
+        Messenger().post({ type: "success", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+
+    {% for message in flash()['warning'] %}
+        Messenger().post({ type: "warning", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+
+    {% for message in flash()['error'] %}
+        Messenger().post({ type: "error", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+</script>