diff --git a/resources/gulp/build.js b/resources/gulp/build.js
index fd4818a80e..956ab2fad3 100644
--- a/resources/gulp/build.js
+++ b/resources/gulp/build.js
@@ -45,5 +45,6 @@ gulp.task('build-vendors', [
     'build-jquery-cookie',
     'build-requirejs',
     'build-jquery-treeview',
-    'build-jquery-lazyload'
+    'build-jquery-lazyload',
+    'build-jquery-test-paths'
     ], function() {});
\ No newline at end of file
diff --git a/resources/gulp/components/admin.js b/resources/gulp/components/admin.js
index 9e22c39f0e..408bf5db8d 100644
--- a/resources/gulp/components/admin.js
+++ b/resources/gulp/components/admin.js
@@ -17,6 +17,9 @@ gulp.task('build-admin-js', function(){
     var adminGroup = [
         config.paths.vendors + 'underscore-amd/underscore.js',
         config.paths.vendors + 'jquery-treeview/jquery.treeview.js',
+        // config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js',
+        // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
+        // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
         config.paths.src +  'admin/js/jquery.kb-event.js',
         config.paths.src +  'admin/js/template-dialogs.js',
         config.paths.vendors + 'requirejs/require.js',
diff --git a/resources/gulp/components/setup.js b/resources/gulp/components/setup.js
index c93ee2057d..b56af7f4f7 100644
--- a/resources/gulp/components/setup.js
+++ b/resources/gulp/components/setup.js
@@ -18,7 +18,7 @@ gulp.task('build-setup-js', function(){
         config.paths.vendors + 'jquery.cookie/jquery.cookie.js',
         config.paths.src + 'vendors/jquery-validation/js/jquery.validate.js',
         config.paths.src + 'vendors/jquery-validate.password/js/jquery.validate.password.js',
-        config.paths.src + 'setup/js/path_files_tests.jquery.js'
+        config.paths.src + 'vendors/jquery-test-paths/jquery.test-paths.js'
     ];
     return utils.buildJsGroup(setupGroup, 'setup', 'setup/js', debugMode);
 });
diff --git a/resources/gulp/components/vendors/jquery-test-paths.js b/resources/gulp/components/vendors/jquery-test-paths.js
new file mode 100644
index 0000000000..3a48895616
--- /dev/null
+++ b/resources/gulp/components/vendors/jquery-test-paths.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp');
+var config = require('../../config.js');
+var utils = require('../../utils.js');
+
+gulp.task('build-jquery-test-paths', function(){
+    return utils.buildJsGroup([
+        config.paths.src + 'vendors/jquery-test-paths/jquery.test-paths.js'
+    ], 'jquery.test-paths', 'vendors/jquery-test-paths');
+});
\ No newline at end of file
diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss
index 0edb76d346..4217919be0 100644
--- a/resources/www/admin/styles/main.scss
+++ b/resources/www/admin/styles/main.scss
@@ -5,6 +5,14 @@
 @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';
 @import '../../_shared/styles/main';
 
+// override jquery ui theme colors:
+$uiTextContentColor: #333333;
+$uiTextTitleColor: #333333;
+$uiLinkColor: #333333;
+$uiLinkFocusColor: #333333;
+$uiLinkActiveColor: #333333;
+@import '../../_shared/styles/jquery-ui/ui-lightness';
+
 /******* GLOBAL CSS for ADMIN *************************************************/
 body {
   margin: 0;
@@ -116,6 +124,9 @@ div.finder div.content div.title {
 #mainMenu span.selected {
   border-top: 3px solid #000000;
 }
+#mainContent {
+  margin-top: $mainMenuHeight;
+}
 /******* LEFT SIDE ************************************************************/
 #left {
   background-color: #fffbcd;
diff --git a/resources/www/setup/js/path_files_tests.jquery.js b/resources/www/vendors/jquery-test-paths/jquery.test-paths.js
similarity index 100%
rename from resources/www/setup/js/path_files_tests.jquery.js
rename to resources/www/vendors/jquery-test-paths/jquery.test-paths.js
diff --git a/templates/web/admin/databox/cgus.html.twig b/templates/web/admin/databox/cgus.html.twig
index ec601c40dc..5c684aa4a6 100644
--- a/templates/web/admin/databox/cgus.html.twig
+++ b/templates/web/admin/databox/cgus.html.twig
@@ -39,13 +39,18 @@
             active:$("#tabs ul li").index($('#tabs ul li.current'))
         });
 
+        if (typeof(tinymce) !== "undefined") {
+            if (tinymce.activeEditor !== null) {
+                tinymce.editors=[]; // remove any existing references
+            }
+        }
         tinymce.init({
-                selector: "textarea",
-                plugins: [
-                        "searchreplace",
-                        "contextmenu paste"
-                ],
-                toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent",
+            selector: "textarea",
+            plugins: [
+                    "searchreplace",
+                    "contextmenu paste"
+            ],
+            toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent"
         });
     });
 </script>
diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index 3c21af3732..3be356d7be 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -61,7 +61,7 @@
 {% block content %}
     <div id="admin-app" data-usr="{{ app.getAuthenticatedUser().getId() }}" data-notif-url="{{ path('list_notifications') }}">
     <div id="left" class="PNB left-view" style="width:250px;right:auto;" data-tree-url="{{ path("admin_display_tree") }}" data-websocket="{{ "ws://" ~ app["conf"].get(["main" ,"websocket-server", "host"]) ~ ":" ~ app["conf"].get(["main" ,"websocket-server", "port"]) ~ "/websockets" }}">
-        <div class="PNB10" style="right:0; top:28px;">
+        <div class="PNB10" style="right:0; top:0px;">
             <div id="FNDR">
                 {% include 'admin/tree.html.twig' %}
             </div>
diff --git a/templates/web/admin/subdefs.html.twig b/templates/web/admin/subdefs.html.twig
index b6f523b012..d8634902a0 100644
--- a/templates/web/admin/subdefs.html.twig
+++ b/templates/web/admin/subdefs.html.twig
@@ -2,7 +2,7 @@
 {% extends "admin/common/iframe_wrap.html.twig" %}
 
 {% block stylesheet %}
-<link type="text/css" rel="stylesheet" href="/assets/vendors/jquery-ui/css/ui-lightness{% if not app.debug %}.min{% endif %}.css">
+{#<link type="text/css" rel="stylesheet" href="/assets/vendors/jquery-ui/css/ui-lightness{% if not app.debug %}.min{% endif %}.css">#}
 <style>
     body{
       overflow:auto;
@@ -11,9 +11,10 @@
 {% endblock %}
 
 {% block javascript %}
+
     <script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
     <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/path_files_tests.jquery.js' }) }}"></script>
+    <script type="text/javascript" src="/assets/vendors/jquery-test-paths/jquery.test-paths{% if not app.debug %}.min{% endif %}.js"></script>
   <script type="text/javascript">
     $(document).ready(function(){
       $('.path_testable').path_file_test();
diff --git a/www/scripts/apps/admin/main/app.js b/www/scripts/apps/admin/main/app.js
index a94fa5698e..872ba6c8dc 100644
--- a/www/scripts/apps/admin/main/app.js
+++ b/www/scripts/apps/admin/main/app.js
@@ -21,7 +21,7 @@ define([
         eventManager: _.extend({}, Backbone.Events)
     };
 
-    var pullNotifications = function (){
+    window.pullNotifications = function (){
         $.ajax({
             type: "POST",
             url:  AdminApp.$scope.data("notif-url"),
@@ -31,10 +31,10 @@ define([
                 usr : AdminApp.$scope.data("usr")
             },
             error: function(){
-                window.setTimeout("pollNotifications();", 10000);
+                window.setTimeout("pullNotifications();", 10000);
             },
             timeout: function(){
-                window.setTimeout("pollNotifications();", 10000);
+                window.setTimeout("pullNotifications();", 10000);
             },
             success: function(data){
                 if (data) {
@@ -44,7 +44,7 @@ define([
                 if (data.apps && parseInt(data.apps) > 1) {
                     t = Math.round((Math.sqrt(parseInt(data.apps)-1) * 1.3 * 120000));
                 }
-                window.setTimeout("pollNotifications();", t);
+                window.setTimeout("pullNotifications();", t);
             }
         });
     };