diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js
index 8e8ae865c..faebfb47d 100644
--- a/runtime/src/js/pgadmin.js
+++ b/runtime/src/js/pgadmin.js
@@ -426,10 +426,10 @@ function addCommonMenus(pgBrowser, menu) {
 }
 
 function getSubMenu(pgBrowser, menuItem) {
-  var submenu = new gui.Menu();
+  let submenu = new gui.Menu();
   if (menuItem.menu_items) {
     menuItem.menu_items.forEach((item) => {
-      let menuType = typeof item.checked == 'boolean' ? 'checkbox' : item.type || 'normal';
+      let menuType = typeof item.checked == 'boolean' ? 'checkbox' : item.type;
       submenu.append(new gui.MenuItem({
         label: item.label,
         enabled: !item.is_disabled,
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 974790f8d..65deb863d 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -478,8 +478,8 @@ define('pgadmin.browser', [
       let {name: browser} = getBrowser();
       if(browser == 'Nwjs') {
         pgBrowser.MainMenus.forEach((menu) => {
-          menu.menuItems.forEach((item) => {
-            item.setDisabled(item.disabled(d, item));
+          menu.menuItems.forEach((_item) => {
+            _item.setDisabled(_item.disabled(d, item));
           });
         });
       }else {
diff --git a/web/pgadmin/browser/static/js/main_menu.js b/web/pgadmin/browser/static/js/main_menu.js
index 98bd8a4cb..c4b10d621 100644
--- a/web/pgadmin/browser/static/js/main_menu.js
+++ b/web/pgadmin/browser/static/js/main_menu.js
@@ -28,22 +28,22 @@ export default function createMainMenus() {
     // Don't add menuItems for Object menu as it's menuItems get changed on tree selection.
     if(_menu.name !== 'object') {
       menuObj.addMenuItems(Object.values(pgAdmin.Browser.menus[_menu.name]));
-      let priority = null;
       menuObj.menuItems.forEach((menuItem, index)=> {
-        if(index == 0) {
-          priority = menuItem.priority;
+        menuItem?.menu_items?.forEach((item, indx)=> {
+          item.below && menuItem?.menu_items.splice(indx+1, 0, getSeparator());
+        });
+        if(menuItem.below) {
+          menuObj.addMenuItem(getSeparator(), index+1);
         }
-
-        if(priority !== menuItem.priority) {
-          let separateMenuItem = new MenuItem({type: 'separator'});
-          menuObj.addMenuItem(separateMenuItem, index);
-        }
-
       });
     }
   });
 }
 
+function getSeparator() {
+  return new MenuItem({type: 'separator'});
+}
+
 export function refreshMainMenuItems(menu, menuItems) {
   if(browser == 'Nwjs') {
     menu.setMenuItems(menuItems);
diff --git a/web/pgadmin/browser/static/js/quick_search/menuitems_help.js b/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
index 28ac57b43..6e2cac466 100644
--- a/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
+++ b/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
@@ -55,7 +55,7 @@ export function menuSearch(param, props) {
 
   // Starting Point
   let {name: browser} = getBrowser();
-  const mainMenus = browser == 'Nwjs' ?pgAdmin.Browser.MainMenus : MainMenus;
+  const mainMenus = browser == 'Nwjs' ? pgAdmin.Browser.MainMenus : MainMenus;
   if(browser == 'Nwjs') {
     mainMenus.forEach((menu) => {
       let subMenus = menu.menuItems;
diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py
index a45c877a1..22a2d7284 100644
--- a/web/pgadmin/help/__init__.py
+++ b/web/pgadmin/help/__init__.py
@@ -26,7 +26,7 @@ class HelpModule(PgAdminModule):
             MenuItem(name='mnu_quick_search_help',
                      label=gettext('Quick Search'),
                      priority=99,
-                     target='pgadmin_help',
+                     target='pgadmin_quick_search_help',
                      icon='fa fa-question',
                      url='#'),
             MenuItem(name='mnu_online_help',
diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py
index 688d442a1..ca10d3129 100644
--- a/web/pgadmin/settings/__init__.py
+++ b/web/pgadmin/settings/__init__.py
@@ -37,7 +37,6 @@ class SettingsModule(PgAdminModule):
                     priority=998,
                     module="pgAdmin.Settings",
                     callback='show',
-                    icon='fa fa-retweet',
                     label=gettext('Reset Layout')
                 )
             ]
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 83cc4801c..1ca4ff9e2 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -151,7 +151,8 @@
 }
 
 .pg-docker-native {
-  top: 0px !important
+  top: 0px !important;
+  border-top: 1px solid $border-color;
 }
 
 .pg-panel-content {