diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 1792d4b3d..8ce7b0904 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -677,7 +677,7 @@ define('pgadmin.node.server', [
             );
             // Generate the event that database is connected
             pgBrowser.Events.trigger(
-              'pgadmin:database:connected', _data._id, _data.db, _item, _data
+              'pgadmin:database:connected', _item, _data
             );
 
             // Load dashboard
diff --git a/web/pgadmin/misc/statistics/static/js/Statistics.jsx b/web/pgadmin/misc/statistics/static/js/Statistics.jsx
index 9757ce11c..c60e81702 100644
--- a/web/pgadmin/misc/statistics/static/js/Statistics.jsx
+++ b/web/pgadmin/misc/statistics/static/js/Statistics.jsx
@@ -80,7 +80,7 @@ function getColumn(data, singleLineStatistics, prettifyFields=[]) {
       {
         Header: 'Value',
         accessor: 'value',
-        sortable: true,
+        sortable: false,
         resizable: true,
         disableGlobalFilter: false,
       },
diff --git a/web/pgadmin/static/js/SchemaView/FormView.jsx b/web/pgadmin/static/js/SchemaView/FormView.jsx
index affaa9c55..2496cbaaa 100644
--- a/web/pgadmin/static/js/SchemaView/FormView.jsx
+++ b/web/pgadmin/static/js/SchemaView/FormView.jsx
@@ -54,6 +54,9 @@ const useStyles = makeStyles((theme)=>({
   nonTabPanel: {
     padding: 0,
     background: 'inherit',
+  },
+  nonTabPanelContent: {
+    height: 'unset'
   }
 }));
 
@@ -454,7 +457,7 @@ export default function FormView({
         </Box>
       </>);
   } else {
-    let contentClassName = [stateUtils.formErr.message ? classes.errorMargin : null];
+    let contentClassName = [classes.nonTabPanelContent, stateUtils.formErr.message ? classes.errorMargin : null];
     return (
       <>
         <Box height="100%" display="flex" flexDirection="column" className={clsx(className)} ref={formRef} data-test="form-view">
diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index 277c59886..2aa83c602 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -555,7 +555,7 @@ FormInputSwitch.propTypes = {
   controlGridBasis: PropTypes.number,
 };
 
-export function InputCheckbox({ cid, helpid, value, onChange, controlProps, readonly, ...props }) {
+export function InputCheckbox({ cid, helpid, value, onChange, controlProps, readonly, labelPlacement, ...props }) {
   controlProps = controlProps || {};
   return (
     <FormControlLabel
@@ -569,6 +569,7 @@ export function InputCheckbox({ cid, helpid, value, onChange, controlProps, read
           {...props} />
       }
       label={controlProps.label}
+      labelPlacement={labelPlacement}
     />
   );
 }
@@ -579,6 +580,7 @@ InputCheckbox.propTypes = {
   controlProps: PropTypes.object,
   onChange: PropTypes.func,
   readonly: PropTypes.bool,
+  labelPlacement: PropTypes.string
 };
 
 export function FormInputCheckbox({ hasError, required, label,
@@ -599,7 +601,7 @@ FormInputCheckbox.propTypes = {
   testcid: PropTypes.string,
 };
 
-export function InputRadio({ helpid, value, onChange, controlProps, readonly, ...props }) {
+export function InputRadio({ helpid, value, onChange, controlProps, readonly, labelPlacement, ...props }) {
   const classes = useStyles();
   controlProps = controlProps || {};
   return (
@@ -622,6 +624,7 @@ export function InputRadio({ helpid, value, onChange, controlProps, readonly, ..
 
       }
       label={controlProps.label}
+      labelPlacement={labelPlacement}
       className={(readonly || props.disabled) ? classes.readOnlySwitch : null}
     />
   );
diff --git a/web/pgadmin/static/js/components/TabPanel.jsx b/web/pgadmin/static/js/components/TabPanel.jsx
index ae106fa63..fd9a6096b 100644
--- a/web/pgadmin/static/js/components/TabPanel.jsx
+++ b/web/pgadmin/static/js/components/TabPanel.jsx
@@ -17,6 +17,9 @@ export const tabPanelStyles = makeStyles((theme)=>({
   root: {
     ...theme.mixins.tabPanel,
   },
+  content: {
+    height: '100%',
+  }
 }));
 
 /* Material UI does not have any tabpanel component, we create one for us */
diff --git a/web/pgadmin/static/js/helpers/Layout/index.jsx b/web/pgadmin/static/js/helpers/Layout/index.jsx
index 64c4820c2..89861bade 100644
--- a/web/pgadmin/static/js/helpers/Layout/index.jsx
+++ b/web/pgadmin/static/js/helpers/Layout/index.jsx
@@ -16,13 +16,14 @@ import { showRenameTab } from '../../Dialogs';
 import usePreferences from '../../../../preferences/static/js/store';
 import _ from 'lodash';
 
-function TabTitle({id, icon, title, closable, tooltip}) {
-  const [attrs, setAttrs] = useState({
-    icon: icon,
-    title: title,
-    tooltip: tooltip??title,
-  });
+function TabTitle({id, closable, defaultInternal}) {
   const layoutDocker = React.useContext(LayoutDockerContext);
+  const internal = layoutDocker?.find(id)?.internal ?? defaultInternal;
+  const [attrs, setAttrs] = useState({
+    icon: internal.icon,
+    title: internal.title,
+    tooltip: internal.tooltip ?? internal.title,
+  });
   const onContextMenu = useCallback((e)=>{
     const g = layoutDocker.find(id)?.group??'';
     if((layoutDocker.noContextGroups??[]).includes(g)) return;
@@ -32,17 +33,21 @@ function TabTitle({id, icon, title, closable, tooltip}) {
   }, []);
 
   useEffect(()=>{
-    const deregister = layoutDocker.eventBus.registerListener(LAYOUT_EVENTS.REFRESH_TITLE, _.debounce((panelId)=>{
-      if(panelId == id) {
-        const p = layoutDocker.find(id)?.internal??{};
-        setAttrs({
-          icon: p.icon,
-          title: p.title,
-          tooltip: p.tooltip??p.title
-        });
-      }
-    }, 100));
-    return deregister;
+    let deregister;
+    if(internal.renamable) {
+      deregister = layoutDocker.eventBus.registerListener(LAYOUT_EVENTS.REFRESH_TITLE, _.debounce((panelId)=>{
+        if(panelId == id) {
+          const internal = layoutDocker?.find(id)?.internal??{};
+          setAttrs({
+            icon: internal.icon,
+            title: internal.title,
+            tooltip: internal.tooltip ?? internal.title,
+          });
+        }
+      }, 100));
+    }
+
+    return ()=>deregister?.();
   }, []);
 
   return (
@@ -58,10 +63,8 @@ function TabTitle({id, icon, title, closable, tooltip}) {
 
 TabTitle.propTypes = {
   id: PropTypes.string,
-  icon: PropTypes.string,
-  title: PropTypes.string,
   closable: PropTypes.bool,
-  tooltip: PropTypes.string
+  defaultInternal: PropTypes.object
 };
 
 export class LayoutDocker {
@@ -259,21 +262,22 @@ export class LayoutDocker {
   }
 
   static getPanel({icon, title, closable, tooltip, renamable, manualClose, ...attrs}) {
+    const internal = {
+      icon: icon,
+      title: title,
+      tooltip: tooltip,
+      closable: _.isUndefined(closable) ? manualClose : closable,
+      renamable: renamable,
+      manualClose: manualClose,
+    };
     return {
       cached: true,
       group: 'default',
       minWidth: 200,
       ...attrs,
       closable: false,
-      title: <TabTitle id={attrs.id} icon={icon} title={title} closable={attrs.group!='dialogs' && closable} tooltip={tooltip} />,
-      internal: {
-        icon: icon,
-        title: title,
-        tooltip: tooltip,
-        closable: _.isUndefined(closable) ? manualClose : closable,
-        renamable: renamable,
-        manualClose: manualClose,
-      }
+      title: <TabTitle id={attrs.id} closable={attrs.group!='dialogs' && closable} defaultInternal={internal}/>,
+      internal: internal
     };
   }
 
diff --git a/web/pgadmin/static/js/helpers/withStandardTabInfo.jsx b/web/pgadmin/static/js/helpers/withStandardTabInfo.jsx
index 8c4cd251f..016f0bfd5 100644
--- a/web/pgadmin/static/js/helpers/withStandardTabInfo.jsx
+++ b/web/pgadmin/static/js/helpers/withStandardTabInfo.jsx
@@ -37,10 +37,14 @@ export default function withStandardTabInfo(Component, tabId) {
         }
       }, 100);
 
-      let deregisterTree = pgAdmin.Browser.Events.on('pgadmin-browser:node:selected', (item, data)=>{
+      const onUpdate =  (item, data)=>{
         setNodeInfo([true, item, data]);
-      });
-      let deregisterTreeUpdate = pgAdmin.Browser.Events.on('pgadmin-browser:tree:updated', (item, data)=>{
+      };
+
+      let deregisterTree = pgAdmin.Browser.Events.on('pgadmin-browser:node:selected', onUpdate);
+      let deregisterTreeUpdate = pgAdmin.Browser.Events.on('pgadmin-browser:tree:updated', onUpdate);
+      let deregisterDbConnected = pgAdmin.Browser.Events.on('pgadmin:database:connected', onUpdate);
+      let deregisterServerConnected = pgAdmin.Browser.Events.on('pgadmin:server:connected', (_sid, item, data)=>{
         setNodeInfo([true, item, data]);
       });
       let deregisterActive = layoutDocker.eventBus.registerListener(LAYOUT_EVENTS.ACTIVE, onTabActive);
@@ -51,6 +55,8 @@ export default function withStandardTabInfo(Component, tabId) {
         onTabActive?.cancel();
         deregisterTree();
         deregisterTreeUpdate();
+        deregisterDbConnected();
+        deregisterServerConnected();
         deregisterActive();
         deregisterChange();
       };