diff --git a/assets/src/css/style.css b/assets/src/css/style.css
index bf3cf3bcf..500d44e5d 100755
--- a/assets/src/css/style.css
+++ b/assets/src/css/style.css
@@ -304,6 +304,7 @@ span.form-control {
 }
 
 #pulsanti {
+    position: sticky;
     top: 0;
     padding: 6px;
     z-index: 1;
@@ -1601,13 +1602,13 @@ kbd{
 
 @media screen and (min-width: 1140px) {
     .with-control-sidebar {
-        margin-right: 150px;
+        margin-right: 200px;
     }
 
     .control-sidebar-open {
         right: 0;
         display: block !important;
-        width: 150px !important;
+        width: 200px !important;
     }
 
     .control-sidebar.control-sidebar-open,
diff --git a/assets/src/js/base/sidebar.js b/assets/src/js/base/sidebar.js
index 63a73894a..3c48a697c 100644
--- a/assets/src/js/base/sidebar.js
+++ b/assets/src/js/base/sidebar.js
@@ -58,7 +58,7 @@ $(document).ready(function () {
 
     // Gestione click sul pulsante per il toggle
     pluginToggle.on("click", function () {
-        $("aside.content-wrapper, .main-footer").toggleClass("with-control-sidebar");
+        $("aside.content-sidebar, section.content, .main-footer").toggleClass("with-control-sidebar");
 
         toggleControlSidebar();
     });
diff --git a/editor.php b/editor.php
index cf782b027..c96267903 100755
--- a/editor.php
+++ b/editor.php
@@ -108,9 +108,9 @@ if (empty($record) || !$has_access) {
 
     echo '
 
-        <div class="nav-tabs-custom">
-            <ul class="nav nav-tabs" id="tabs" role="tablist">
-                <li class="pull-left active header nav-item">
+        <nav class="navbar navbar-expand navbar-light">
+            <ul class="navbar-nav" id="tabs">
+                <li class="nav-item">
                     <a data-widget="tab" href="#tab_0" class="nav-link">
                     <i class="'.$structure['icon'].'"></i> '.$structure->getTranslation('title');
 
@@ -122,14 +122,15 @@ if (empty($record) || !$has_access) {
 
     echo '
 					</a>
-                </li>';
+                </li>
+            </ul>
 
-    echo '
-
-				<li class="control-sidebar-toggle nav-item">
+            <ul class="navbar-nav ml-auto">
+				<li class="nav-item control-sidebar-toggle">
                     <a class="nav-link" style="cursor: pointer">'.tr('Plugin').'</a>
                 </li>
 			</ul>
+        </nav>
 
 			<div class="tab-content">
                 <div id="tab_0" class="tab-pane active nav-item">';