diff --git a/js/functions.js b/js/functions.js
index 23c484ed18..f921f957d0 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3704,6 +3704,7 @@ $(document).ready(function() {
 $(document).ready(function () {
     if ($("#floating_menubar").length) {
         $("#floating_menubar")
+            .css('z-index', 500)
             .append($('#serverinfo'))
             .append($('#topmenucontainer'));
         $('body').css(
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 69252e6eb7..ce8735e8db 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -221,7 +221,9 @@ if ($abort == false) {
      * Displays top menu links
      */
     $active_page = 'tbl_structure.php';
-    include_once './libraries/tbl_links.inc.php';
+    if ($GLOBALS['is_ajax_request'] != true) {
+        include_once './libraries/tbl_links.inc.php';
+    }
     /**
      * Display the form
      */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 28ba2e8976..7c12c14349 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -883,7 +883,6 @@ div#tablestatistics table {
     top: 0;
     left: 0;
     width: 100%';
-    z-index: 500;
 }
 
 #serverinfo {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 2c7acd8c26..f5174c6e69 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1094,7 +1094,6 @@ div#tablestatistics table {
     top: 0;
     left: 0;
     width: 100%';
-    z-index: 500;
 }
 
 #serverinfo {