diff --git a/src/cockpit/389-console/src/database.jsx b/src/cockpit/389-console/src/database.jsx
index 5bfe983ea6..1d4a5b5516 100644
--- a/src/cockpit/389-console/src/database.jsx
+++ b/src/cockpit/389-console/src/database.jsx
@@ -809,6 +809,7 @@ export class Database extends React.Component {
                             cachememsize: config.attrs['nsslapd-cachememsize'][0],
                             cachesize: config.attrs['nsslapd-cachesize'][0],
                             dncachememsize: config.attrs['nsslapd-dncachememsize'][0],
+                            dbstate: config.attrs['nsslapd-state'][0],
                             readOnly: readonly,
                             requireIndex: requireindex,
                         }
@@ -977,6 +978,7 @@ export class Database extends React.Component {
                             cachememsize: config.attrs['nsslapd-cachememsize'][0],
                             cachesize: config.attrs['nsslapd-cachesize'][0],
                             dncachememsize: config.attrs['nsslapd-dncachememsize'][0],
+                            dbstate: config.attrs['nsslapd-state'][0],
                             readOnly: readonly,
                             requireIndex: requireindex,
                         }
diff --git a/src/cockpit/389-console/src/lib/database/chaining.jsx b/src/cockpit/389-console/src/lib/database/chaining.jsx
index 3bae975577..1a13bdae89 100644
--- a/src/cockpit/389-console/src/lib/database/chaining.jsx
+++ b/src/cockpit/389-console/src/lib/database/chaining.jsx
@@ -565,7 +565,7 @@ export class ChainingDatabaseConfig extends React.Component {
                 </TextContent>
                 <Tabs className="ds-margin-top-xlg" activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                     <Tab eventKey={0} title={<TabTitleText><b>Default Creation Settings</b></TabTitleText>}>
-                        <div className="ds-indent">
+                        <div className="ds-indent ds-margin-bottom-md">
                             <Grid
                                 title="The size limit of entries returned over a database link (nsslapd-sizelimit)."
                                 className="ds-margin-top-xlg"
@@ -861,7 +861,6 @@ export class ChainingDatabaseConfig extends React.Component {
                             >
                                 {saveBtnName}
                             </Button>
-                            <hr />
                         </div>
                     </Tab>
                     <Tab eventKey={1} title={<TabTitleText><b>Controls & Components</b></TabTitleText>}>
diff --git a/src/cockpit/389-console/src/lib/database/databaseConfig.jsx b/src/cockpit/389-console/src/lib/database/databaseConfig.jsx
index 3729fe8a27..4766e0a9cf 100644
--- a/src/cockpit/389-console/src/lib/database/databaseConfig.jsx
+++ b/src/cockpit/389-console/src/lib/database/databaseConfig.jsx
@@ -458,7 +458,7 @@ export class GlobalDatabaseConfig extends React.Component {
         }
 
         return (
-            <div className={this.state.saving ? "ds-disabled" : ""} id="db-global-page">
+            <div className={this.state.saving ? "ds-disabled ds-margin-bottom-md" : "ds-margin-bottom-md"} id="db-global-page">
                 {spinner}
                 <div className={this.state.loading ? 'ds-fadeout' : 'ds-fadein'}>
                     <TextContent>
@@ -753,7 +753,6 @@ export class GlobalDatabaseConfig extends React.Component {
                     >
                         {saveBtnName}
                     </Button>
-                    <hr />
                 </div>
             </div>
         );
diff --git a/src/cockpit/389-console/src/lib/database/globalPwp.jsx b/src/cockpit/389-console/src/lib/database/globalPwp.jsx
index e87fbf4aa2..93fe5754a6 100644
--- a/src/cockpit/389-console/src/lib/database/globalPwp.jsx
+++ b/src/cockpit/389-console/src/lib/database/globalPwp.jsx
@@ -1149,7 +1149,7 @@ export class GlobalPwPolicy extends React.Component {
                 </div>;
         } else {
             pwp_element =
-                <div className={this.state.loading ? 'ds-fadeout' : 'ds-fadein ds-left-margin'}>
+                <div className={this.state.loading ? 'ds-fadeout ds-margin-bottom-md' : 'ds-fadein ds-left-margin ds-margin-bottom-md'}>
                     <Tabs className="ds-margin-top-xlg" activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                         <Tab eventKey={0} title={<TabTitleText><b>General Settings</b></TabTitleText>}>
                             <Form className="ds-margin-left-sm" isHorizontal>
@@ -1342,7 +1342,6 @@ export class GlobalPwPolicy extends React.Component {
                             >
                                 {saveBtnName}
                             </Button>
-                            <hr />
                         </Tab>
                         <Tab eventKey={1} title={<TabTitleText><b>Expiration</b></TabTitleText>}>
                             <Form className="ds-margin-top-xlg ds-margin-left" isHorizontal>
diff --git a/src/cockpit/389-console/src/lib/database/indexes.jsx b/src/cockpit/389-console/src/lib/database/indexes.jsx
index bdbde4c13d..2724df4463 100644
--- a/src/cockpit/389-console/src/lib/database/indexes.jsx
+++ b/src/cockpit/389-console/src/lib/database/indexes.jsx
@@ -780,7 +780,7 @@ export class SuffixIndexes extends React.Component {
             <div className="ds-margin-top-xlg ds-left-indent">
                 <Tabs isSecondary isBox activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                     <Tab eventKey={0} title={<TabTitleText>Database Indexes <font size="2">({this.props.indexRows.length})</font></TabTitleText>}>
-                        <div className="ds-left-indent">
+                        <div className="ds-left-indent ds-margin-bottom-md">
                             <IndexTable
                                 editable
                                 rows={this.props.indexRows}
@@ -790,14 +790,12 @@ export class SuffixIndexes extends React.Component {
                                 deleteIndex={this.showConfirmDeleteIndex}
                             />
                             <Button
-                                className="ds-margin-top"
                                 variant="primary"
                                 type="button"
                                 onClick={this.showIndexModal}
                             >
                                 Add Index
                             </Button>
-                            <hr />
                         </div>
                     </Tab>
                     <Tab eventKey={1} title={<TabTitleText>System Indexes <font size="2">({this.props.systemIndexRows.length})</font></TabTitleText>}>
diff --git a/src/cockpit/389-console/src/lib/database/localPwp.jsx b/src/cockpit/389-console/src/lib/database/localPwp.jsx
index 5a8bde2859..1011b3faa4 100644
--- a/src/cockpit/389-console/src/lib/database/localPwp.jsx
+++ b/src/cockpit/389-console/src/lib/database/localPwp.jsx
@@ -120,7 +120,7 @@ class CreatePolicy extends React.Component {
         }
 
         return (
-            <div>
+            <div className="ds-margin-bottom-md">
                 <Form className="ds-margin-left ds-margin-top-xlg" isHorizontal>
                     <TextContent>
                         <Text className="ds-center" component={TextVariants.h3}>
@@ -777,7 +777,6 @@ class CreatePolicy extends React.Component {
                 >
                     Create New Policy
                 </Button>
-                <hr />
             </div>
         );
     }
diff --git a/src/cockpit/389-console/src/lib/database/referrals.jsx b/src/cockpit/389-console/src/lib/database/referrals.jsx
index 908d2c3bf0..fa6563bb59 100644
--- a/src/cockpit/389-console/src/lib/database/referrals.jsx
+++ b/src/cockpit/389-console/src/lib/database/referrals.jsx
@@ -255,13 +255,13 @@ export class SuffixReferrals extends React.Component {
 
     render() {
         return (
-            <div className="ds-sub-header">
+            <div className="ds-sub-header ds-margin-bottom-md">
                 <ReferralTable
                     key={this.props.rows}
                     rows={this.props.rows}
                     deleteRef={this.showConfirmRefDelete}
                 />
-                <Button className="ds-margin-top" variant="primary" onClick={this.showRefModal}>
+                <Button variant="primary" onClick={this.showRefModal}>
                     Create Referral
                 </Button>
                 <DoubleConfirmModal
diff --git a/src/cockpit/389-console/src/lib/database/suffix.jsx b/src/cockpit/389-console/src/lib/database/suffix.jsx
index f3c488f71a..93f604eb30 100644
--- a/src/cockpit/389-console/src/lib/database/suffix.jsx
+++ b/src/cockpit/389-console/src/lib/database/suffix.jsx
@@ -54,11 +54,13 @@ export class Suffix extends React.Component {
             dncachememsize: this.props.data.dncachememsize,
             readOnly: this.props.data.readOnly,
             requireIndex: this.props.data.requireIndex,
+            dbstate: this.props.data.dbstate,
             _cachememsize: this.props.data.cachememsize,
             _cachesize: this.props.data.cachesize,
             _dncachememsize: this.props.data.dncachememsize,
             _readOnly: this.props.data.readOnly,
             _requireIndex: this.props.data.requireIndex,
+            _dbstate: this.props.data.dbstate,
             savingConfig: false,
             saveBtnDisabled: true,
 
@@ -209,7 +211,7 @@ export class Suffix extends React.Component {
 
         const configAttrs = [
             'cachememsize', 'cachesize', 'dncachememsize',
-            'readOnly', 'requireIndex',
+            'readOnly', 'requireIndex', 'dbstate'
         ];
         for (const check_attr of configAttrs) {
             if (attr != check_attr) {
@@ -773,6 +775,10 @@ export class Suffix extends React.Component {
             cmd.push("--dncache-memsize=" + this.state.dncachememsize);
             requireRestart = true;
         }
+        if (this.state._dbstate != this.state.dbstate) {
+            cmd.push("--state=" + this.state.dbstate);
+            requireRestart = true;
+        }
         if (cmd.length > 7) {
             this.setState({
                 savingConfig: true
@@ -797,9 +803,13 @@ export class Suffix extends React.Component {
                     .fail(err => {
                         const errMsg = JSON.parse(err);
                         this.props.reload(this.props.suffix);
+                        let msg = errMsg.desc;
+                        if ('info' in errMsg) {
+                            msg = errMsg.desc + " - " + errMsg.info;
+                        }
                         this.props.addNotification(
                             "error",
-                            `Error updating suffix configuration - ${errMsg.desc}`
+                            `Error updating suffix configuration - ${msg}`
                         );
                         this.setState({
                             savingConfig: false
@@ -875,6 +885,7 @@ export class Suffix extends React.Component {
                                 cachememsize={this.state.cachememsize}
                                 cachesize={this.state.cachesize}
                                 dncachememsize={this.state.dncachememsize}
+                                dbstate={this.state.dbstate}
                                 readOnly={this.state.readOnly}
                                 requireIndex={this.state.requireIndex}
                                 autoTuning={this.state.autoTuning}
diff --git a/src/cockpit/389-console/src/lib/database/suffixConfig.jsx b/src/cockpit/389-console/src/lib/database/suffixConfig.jsx
index db4ccba1fd..8806109f75 100644
--- a/src/cockpit/389-console/src/lib/database/suffixConfig.jsx
+++ b/src/cockpit/389-console/src/lib/database/suffixConfig.jsx
@@ -4,6 +4,8 @@ import {
     Button,
     Checkbox,
     Form,
+    FormSelect,
+    FormSelectOption,
     Grid,
     GridItem,
     TextInput,
@@ -132,7 +134,30 @@ export class SuffixConfig extends React.Component {
             <div className="ds-margin-top-lg">
                 {cacheInputs}
                 <Form isHorizontal>
-                    <Grid className="ds-margin-top-lg" title="Put database in Read-Only mode (nsslapd-readonly).">
+                    <Grid
+                        className="ds-margin-top-lg"
+                        title="Set the backend type.  Warning, changing this setting could lead to unexpected database behavior."
+                    >
+                        <GridItem className="ds-label" span={3}>
+                            Backend State
+                        </GridItem>
+                        <GridItem span={9}>
+                            <FormSelect
+                                id="dbstate"
+                                value={this.props.dbstate}
+                                onChange={(str, e) => {
+                                    this.props.handleChange(e);
+                                }}
+                                aria-label="FormSelect Input"
+                            >
+                                <FormSelectOption value="backend" label="Backend" />
+                                <FormSelectOption value="disabled" label="Disabled" />
+                                <FormSelectOption value="referral" label="Referral" />
+                                <FormSelectOption value="referral on update" label="Referral On Update" />
+                            </FormSelect>
+                        </GridItem>
+                    </Grid>
+                    <Grid title="Put database in Read-Only mode (nsslapd-readonly).">
                         <GridItem span={12}>
                             <Checkbox
                                 label="Database Read-Only Mode"
@@ -145,7 +170,7 @@ export class SuffixConfig extends React.Component {
                             />
                         </GridItem>
                     </Grid>
-                    <Grid className="ds-margin-top" title="Block unindexed searches on this suffix (nsslapd-require-index).">
+                    <Grid title="Block unindexed searches on this suffix (nsslapd-require-index).">
                         <GridItem span={12}>
                             <Checkbox
                                 label="Block Unindexed Searches"
diff --git a/src/cockpit/389-console/src/lib/database/vlvIndexes.jsx b/src/cockpit/389-console/src/lib/database/vlvIndexes.jsx
index 856a6a9718..4f7375a7e4 100644
--- a/src/cockpit/389-console/src/lib/database/vlvIndexes.jsx
+++ b/src/cockpit/389-console/src/lib/database/vlvIndexes.jsx
@@ -410,7 +410,7 @@ export class VLVIndexes extends React.Component {
 
     render() {
         return (
-            <div className="ds-tab-table">
+            <div className="ds-tab-table ds-margin-bottom-md">
                 <VLVTable
                     rows={this.props.vlvItems}
                     key={this.props.vlvItems}
@@ -421,7 +421,6 @@ export class VLVIndexes extends React.Component {
                     updating={this.state.updating}
                 />
                 <Button
-                    className="ds-margin-top"
                     variant="primary"
                     onClick={this.showVLVModal}
                 >
diff --git a/src/cockpit/389-console/src/lib/monitor/dbMonitor.jsx b/src/cockpit/389-console/src/lib/monitor/dbMonitor.jsx
index f6f04cde73..ed34e204e9 100644
--- a/src/cockpit/389-console/src/lib/monitor/dbMonitor.jsx
+++ b/src/cockpit/389-console/src/lib/monitor/dbMonitor.jsx
@@ -230,7 +230,7 @@ export class DatabaseMonitor extends React.Component {
                 <Tabs activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                     <Tab eventKey={0} title={<TabTitleText><b>Database Cache</b></TabTitleText>}>
                         <div className="ds-margin-top">
-                            <Card>
+                            <Card isHoverable>
                                 <CardBody>
                                     <div className="ds-container">
                                         <div className="ds-center">
@@ -326,7 +326,7 @@ export class DatabaseMonitor extends React.Component {
                         <div className="ds-margin-top-lg">
                             <Grid hasGutter>
                                 <GridItem span={6}>
-                                    <Card>
+                                    <Card isHoverable>
                                         <CardBody>
                                             <div className="ds-container">
                                                 <div className="ds-center">
@@ -372,7 +372,7 @@ export class DatabaseMonitor extends React.Component {
                                     </Card>
                                 </GridItem>
                                 <GridItem span={6}>
-                                    <Card>
+                                    <Card isHoverable>
                                         <CardBody>
                                             <div className="ds-container">
                                                 <div className="ds-center">
diff --git a/src/cockpit/389-console/src/lib/monitor/replMonitor.jsx b/src/cockpit/389-console/src/lib/monitor/replMonitor.jsx
index 9883585bbf..c91969d85b 100644
--- a/src/cockpit/389-console/src/lib/monitor/replMonitor.jsx
+++ b/src/cockpit/389-console/src/lib/monitor/replMonitor.jsx
@@ -1319,7 +1319,7 @@ export class ReplMonitor extends React.Component {
         }
 
         const reportContent =
-            <div className="ds-margin-top-lg ds-indent">
+            <div className="ds-margin-top-lg ds-indent ds-margin-bottom-md">
                 <Tabs isBox activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                     <Tab eventKey={0} title={<TabTitleText>{_("Prepare Report")}</TabTitleText>}>
                         <ExpandableSection
@@ -1410,7 +1410,6 @@ export class ReplMonitor extends React.Component {
                         >
                             Add Alias
                         </Button>
-                        <hr />
                     </Tab>
                     <Tab isHidden={reportData.length == 0} eventKey={1} title={<TabTitleText>{_("Report Result")}</TabTitleText>}>
                         <div className="ds-indent ds-margin-top-lg">
diff --git a/src/cockpit/389-console/src/lib/monitor/suffixMonitor.jsx b/src/cockpit/389-console/src/lib/monitor/suffixMonitor.jsx
index b81478a358..c58c8525a9 100644
--- a/src/cockpit/389-console/src/lib/monitor/suffixMonitor.jsx
+++ b/src/cockpit/389-console/src/lib/monitor/suffixMonitor.jsx
@@ -27,7 +27,7 @@ import {
     faLeaf,
     faTree,
 } from '@fortawesome/free-solid-svg-icons';
-import { numToCommas, displayBytes } from '../tools.jsx';
+import { numToCommas, displayBytes, log_cmd } from '../tools.jsx';
 
 export class SuffixMonitor extends React.Component {
     constructor (props) {
@@ -135,6 +135,7 @@ export class SuffixMonitor extends React.Component {
             "dsconf", "-j", "ldapi://%2fvar%2frun%2fslapd-" + this.props.serverId + ".socket",
             "monitor", "backend", this.props.suffix
         ];
+        log_cmd("refreshSuffixCache", "Get suffix monitor", cmd);
         cockpit
                 .spawn(cmd, { superuser: true, err: "message" })
                 .done(content => {
@@ -298,7 +299,7 @@ export class SuffixMonitor extends React.Component {
                             <div className="ds-margin-top">
                                 <Grid hasGutter>
                                     <GridItem span={6}>
-                                        <Card>
+                                        <Card isHoverable>
                                             <CardBody>
                                                 <div className="ds-container">
                                                     <div className="ds-center">
@@ -344,7 +345,7 @@ export class SuffixMonitor extends React.Component {
                                         </Card>
                                     </GridItem>
                                     <GridItem span={6}>
-                                        <Card>
+                                        <Card isHoverable>
                                             <CardBody>
                                                 <div className="ds-container">
                                                     <div className="ds-center">
@@ -402,43 +403,44 @@ export class SuffixMonitor extends React.Component {
                                     Entry Cache Hit Ratio:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{this.state.data.entrycachehitratio}%</b>
+                                    <b>{this.state.data.entrycachehitratio[0]}%</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    Entry Cache Tries:
+                                    Entry Cache Max Size:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.entrycachetries)}</b>
+                                    <b>{displayBytes(cachemax)} </b>
                                 </GridItem>
+
                                 <GridItem span={3}>
                                     Entry Cache Hits:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.entrycachehits)}</b>
+                                    <b>{numToCommas(this.state.data.entrycachehits[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    Entry Cache Max Size:
+                                    Entry Cache Current Size:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{displayBytes(this.state.data.maxentrycachesize)} </b>
+                                    <b>{displayBytes(cachecurr)}</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    Entry Cache Current Size:
+                                    Entry Cache Tries:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{displayBytes(this.state.data.currententrycachesize)}</b>
+                                    <b>{numToCommas(this.state.data.entrycachetries[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
                                     Entry Cache Max Entries:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.maxentrycachecount)}</b>
+                                    <b>{numToCommas(this.state.data.maxentrycachecount[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
                                     Entry Cache Count:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.currententrycachecount)}</b>
+                                    <b>{numToCommas(this.state.data.currententrycachecount[0])}</b>
                                 </GridItem>
                             </Grid>
                         </Tab>
@@ -446,7 +448,7 @@ export class SuffixMonitor extends React.Component {
                             <div className="ds-margin-top">
                                 <Grid hasGutter>
                                     <GridItem span={6}>
-                                        <Card>
+                                        <Card isHoverable>
                                             <CardBody>
                                                 <div className="ds-container">
                                                     <div className="ds-center">
@@ -492,7 +494,7 @@ export class SuffixMonitor extends React.Component {
                                         </Card>
                                     </GridItem>
                                     <GridItem span={6}>
-                                        <Card>
+                                        <Card isHoverable>
                                             <CardBody>
                                                 <div className="ds-container">
                                                     <div className="ds-center">
@@ -550,43 +552,43 @@ export class SuffixMonitor extends React.Component {
                                     DN Cache Hit Ratio:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{this.state.data.dncachehitratio}%</b>
+                                    <b>{this.state.data.dncachehitratio[0]}%</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    DN Cache Tries:
+                                    DN Cache Max Size:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.dncachetries)}</b>
+                                    <b>{displayBytes(dncachemax)}</b>
                                 </GridItem>
                                 <GridItem span={3}>
                                     DN Cache Hits:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.dncachehits)}</b>
+                                    <b>{numToCommas(this.state.data.dncachehits[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    DN Cache Max Size:
+                                    DN Cache Current Size:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{displayBytes(this.state.data.maxdncachesize)}</b>
+                                    <b>{displayBytes(dncachecurr)}</b>
                                 </GridItem>
                                 <GridItem span={3}>
-                                    DN Cache Current Size:
+                                    DN Cache Tries:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{displayBytes(this.state.data.currentdncachesize)}</b>
+                                    <b>{numToCommas(this.state.data.dncachetries[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
                                     DN Cache Max Count:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.maxdncachecount)}</b>
+                                    <b>{numToCommas(this.state.data.maxdncachecount[0])}</b>
                                 </GridItem>
                                 <GridItem span={3}>
                                     DN Cache Current Count:
                                 </GridItem>
                                 <GridItem span={2}>
-                                    <b>{numToCommas(this.state.data.currentdncachecount)}</b>
+                                    <b>{numToCommas(this.state.data.currentdncachecount[0])}</b>
                                 </GridItem>
                             </Grid>
                         </Tab>
diff --git a/src/cockpit/389-console/src/lib/replication/replAgmts.jsx b/src/cockpit/389-console/src/lib/replication/replAgmts.jsx
index 8afaa2239b..d9686f5ab0 100644
--- a/src/cockpit/389-console/src/lib/replication/replAgmts.jsx
+++ b/src/cockpit/389-console/src/lib/replication/replAgmts.jsx
@@ -1538,7 +1538,7 @@ export class ReplAgmts extends React.Component {
 
     render() {
         return (
-            <div className="ds-margin-right">
+            <div className="ds-margin-right ds-margin-bottom-md">
                 <ReplAgmtTable
                     key={this.state.rows}
                     rows={this.state.rows}
diff --git a/src/cockpit/389-console/src/lib/replication/replConfig.jsx b/src/cockpit/389-console/src/lib/replication/replConfig.jsx
index a881735293..9a64073590 100644
--- a/src/cockpit/389-console/src/lib/replication/replConfig.jsx
+++ b/src/cockpit/389-console/src/lib/replication/replConfig.jsx
@@ -603,7 +603,7 @@ export class ReplConfig extends React.Component {
                             onToggle={this.onToggle}
                             isExpanded={this.state.isExpanded}
                         >
-                            <div className="ds-margin-top ds-margin-left">
+                            <div className="ds-margin-top ds-margin-left ds-margin-bottom-md">
                                 <Grid
                                     title="The DN of the replication manager group"
                                     className="ds-margin-top"
@@ -817,7 +817,6 @@ export class ReplConfig extends React.Component {
                                         </Button>
                                     </GridItem>
                                 </Grid>
-                                <hr />
                             </div>
                         </ExpandableSection>
                     </Form>
diff --git a/src/cockpit/389-console/src/lib/replication/winsyncAgmts.jsx b/src/cockpit/389-console/src/lib/replication/winsyncAgmts.jsx
index 968804a393..eebd2a6005 100644
--- a/src/cockpit/389-console/src/lib/replication/winsyncAgmts.jsx
+++ b/src/cockpit/389-console/src/lib/replication/winsyncAgmts.jsx
@@ -1208,7 +1208,7 @@ export class WinsyncAgmts extends React.Component {
                     search={this.onSearchChange}
                     value={this.state.value}
                 />
-                <div className="ds-margin-top ds-container ds-inline">
+                <div className="ds-margin-top ds-container ds-inline ds-margin-bottom-md">
                     <Button
                         variant="primary"
                         onClick={this.showCreateAgmtModal}
diff --git a/src/cockpit/389-console/src/lib/security/ciphers.jsx b/src/cockpit/389-console/src/lib/security/ciphers.jsx
index f94f8a75db..2088fd6d55 100644
--- a/src/cockpit/389-console/src/lib/security/ciphers.jsx
+++ b/src/cockpit/389-console/src/lib/security/ciphers.jsx
@@ -478,7 +478,6 @@ export class Ciphers extends React.Component {
                     >
                         {saveBtnName}
                     </Button>
-                    <hr />
                 </div>;
         }
 
diff --git a/src/cockpit/389-console/src/lib/server/errorLog.jsx b/src/cockpit/389-console/src/lib/server/errorLog.jsx
index 97a34fdf83..e728b813c2 100644
--- a/src/cockpit/389-console/src/lib/server/errorLog.jsx
+++ b/src/cockpit/389-console/src/lib/server/errorLog.jsx
@@ -745,7 +745,7 @@ export class ServerErrorLog extends React.Component {
         }
 
         return (
-            <div id="server-errorlog-page" className={this.state.loading ? "ds-disabled" : ""}>
+            <div id="server-errorlog-page" className={this.state.loading ? "ds-disabled ds-margin-bottom-md" : "ds-margin-bottom-md"}>
                 <Grid>
                     <GridItem span={3}>
                         <TextContent>
diff --git a/src/cockpit/389-console/src/lib/server/sasl.jsx b/src/cockpit/389-console/src/lib/server/sasl.jsx
index 605f1dca40..c821e75760 100644
--- a/src/cockpit/389-console/src/lib/server/sasl.jsx
+++ b/src/cockpit/389-console/src/lib/server/sasl.jsx
@@ -661,7 +661,7 @@ export class ServerSASL extends React.Component {
                 </div>;
         } else {
             body =
-                <div className={this.state.configLoading ? "ds-disabled" : ""}>
+                <div className={this.state.configLoading ? "ds-disabled ds-margin-bottom-md" : "ds-margin-bottom-md"}>
                     <Grid>
                         <GridItem span={3}>
                             <TextContent>
@@ -771,7 +771,6 @@ export class ServerSASL extends React.Component {
                     >
                         Create New Mapping
                     </Button>
-                    <hr />
                 </div>;
         }
 
diff --git a/src/cockpit/389-console/src/lib/server/settings.jsx b/src/cockpit/389-console/src/lib/server/settings.jsx
index a5d1117387..cf05a8e65d 100644
--- a/src/cockpit/389-console/src/lib/server/settings.jsx
+++ b/src/cockpit/389-console/src/lib/server/settings.jsx
@@ -832,7 +832,7 @@ export class ServerSettings extends React.Component {
 
         if (this.state['nsslapd-disk-monitoring']) {
             diskMonitor =
-                <Form isHorizontal className="ds-margin-top-lg ds-left-indent-lg">
+                <Form isHorizontal className="ds-margin-top-lg ds-left-indent-lg ds-margin-bottom">
                     <Grid
                         title="The available disk space, in bytes, that will trigger the shutdown process. Default is 2mb. Once below half of the threshold then we enter the shutdown mode. (nsslapd-disk-monitoring-threshold)"
                     >
@@ -901,7 +901,7 @@ export class ServerSettings extends React.Component {
                 </div>;
         } else {
             body =
-                <div>
+                <div className="ds-margin-bottom-md">
                     <Grid>
                         <GridItem span={3}>
                             <TextContent>
@@ -1390,7 +1390,6 @@ export class ServerSettings extends React.Component {
                                 >
                                     {saveBtnName}
                                 </Button>
-                                <hr />
                             </Tab>
                         </Tabs>
                     </div>
diff --git a/src/cockpit/389-console/src/lib/server/tuning.jsx b/src/cockpit/389-console/src/lib/server/tuning.jsx
index 9f24139d2b..7c651a9f0a 100644
--- a/src/cockpit/389-console/src/lib/server/tuning.jsx
+++ b/src/cockpit/389-console/src/lib/server/tuning.jsx
@@ -260,7 +260,7 @@ export class ServerTuning extends React.Component {
                 </div>;
         } else {
             body =
-                <div className={this.state.loading ? "ds-disabled" : ""}>
+                <div className={this.state.loading ? "ds-disabled ds-margin-bottom-md" : "ds-margin-bottom-md"}>
                     <Grid>
                         <GridItem span={3}>
                             <TextContent>
@@ -602,7 +602,6 @@ export class ServerTuning extends React.Component {
                     >
                         {saveBtnName}
                     </Button>
-                    <hr />
                 </div>;
         }
 
diff --git a/src/cockpit/389-console/src/monitor.jsx b/src/cockpit/389-console/src/monitor.jsx
index ff5015b060..45d1c561af 100644
--- a/src/cockpit/389-console/src/monitor.jsx
+++ b/src/cockpit/389-console/src/monitor.jsx
@@ -944,6 +944,7 @@ export class Monitor extends React.Component {
                                 bename={this.state.bename}
                                 enableTree={this.enableTree}
                                 key={this.state.node_text}
+                                addNotification={this.props.addNotification}
                             />;
                     }
                 }
diff --git a/src/cockpit/389-console/src/schema.jsx b/src/cockpit/389-console/src/schema.jsx
index d920de85d9..7f4e898e54 100644
--- a/src/cockpit/389-console/src/schema.jsx
+++ b/src/cockpit/389-console/src/schema.jsx
@@ -1389,7 +1389,7 @@ export class Schema extends React.Component {
             );
         } else {
             schemaPage = (
-                <div className="ds-indent ds-margin-top-xlg">
+                <div className="ds-indent ds-margin-top-xlg ds-margin-bottom-md">
                     <Tabs isBox activeKey={this.state.activeTabKey} onSelect={this.handleNavSelect}>
                         <Tab eventKey={0} title={<TabTitleText>Objectclasses</TabTitleText>}>
                             <div className="ds-margin-top-xlg ds-indent">
@@ -1416,7 +1416,6 @@ export class Schema extends React.Component {
                                 >
                                     Add ObjectClass
                                 </Button>
-                                <hr />
                                 <ObjectClassModal
                                     addHandler={this.addObjectclass}
                                     editHandler={this.editObjectclass}
@@ -1479,7 +1478,6 @@ export class Schema extends React.Component {
                                 >
                                     Add Attribute
                                 </Button>
-                                <hr />
                                 <AttributeTypeModal
                                     addHandler={this.addAttribute}
                                     editHandler={this.editAttribute}
diff --git a/src/cockpit/389-console/src/security.jsx b/src/cockpit/389-console/src/security.jsx
index 93ce5f12cf..de96bbdc1f 100644
--- a/src/cockpit/389-console/src/security.jsx
+++ b/src/cockpit/389-console/src/security.jsx
@@ -818,7 +818,7 @@ export class Security extends React.Component {
             let configPage = "";
             if (this.state.securityEnabled) {
                 configPage =
-                    <div>
+                    <div className="ds-margin-bottom-md">
                         <Form isHorizontal autoComplete="off">
                             <Grid
                                 title="This parameter can be used to restrict the Directory Server instance to a single IP interface (hostname, or IP address).  This parameter specifically sets what interface to use for TLS traffic.  Requires restart. (nsslapd-securelistenhost)."
@@ -1031,12 +1031,11 @@ export class Security extends React.Component {
                         >
                             {saveBtnName}
                         </Button>
-                        <hr />
                     </div>;
             }
 
             securityPage =
-                <div>
+                <div className="ds-margin-bottom-md">
                     <Grid>
                         <GridItem span={6}>
                             <TextContent>
diff --git a/src/lib389/lib389/backend.py b/src/lib389/lib389/backend.py
index 4a69b5aa6a..072085f27e 100644
--- a/src/lib389/lib389/backend.py
+++ b/src/lib389/lib389/backend.py
@@ -865,6 +865,37 @@ def get_cos_classic_defs(self):
     def get_cos_templates(self):
         return CosTemplates(self._instance, self._dn).list()
 
+    def get_state(self):
+        suffix = self.get_attr_val_utf8('nsslapd-suffix')
+        try:
+            mt = self._mts.get(suffix)
+        except ldap.NO_SUCH_OBJECT:
+            raise ValueError("Backend missing mapping tree entry, unable to get state")
+        return mt.get_attr_val_utf8('nsslapd-state')
+
+    def set_state(self, new_state):
+        new_state = new_state.lower()
+        suffix = self.get_attr_val_utf8('nsslapd-suffix')
+        try:
+            mt = self._mts.get(suffix)
+        except ldap.NO_SUCH_OBJECT:
+            raise ValueError("Backend missing mapping tree entry, unable to set configuration")
+
+        if new_state not in ['backend', 'disabled',  'referral',  'referral on update']:
+            raise ValueError(f"Invalid backend state {new_state}, value must be one of the following: 'backend', 'disabled',  'referral',  'referral on update'")
+
+        # Can not change state of replicated backend
+        replicas = Replicas(self._instance)
+        try:
+            # Check if replication is enabled
+            replicas.get(suffix)
+            raise ValueError("Can not change the backend state of a replicated suffix")
+        except ldap.NO_SUCH_OBJECT:
+            pass
+
+        # Ok, change the state
+        mt.replace('nsslapd-state', new_state)
+
 
 class Backends(DSLdapObjects):
     """DSLdapObjects that represents DN_LDBM base DN
diff --git a/src/lib389/lib389/cli_conf/backend.py b/src/lib389/lib389/cli_conf/backend.py
index ea418c2009..92b573200f 100644
--- a/src/lib389/lib389/cli_conf/backend.py
+++ b/src/lib389/lib389/cli_conf/backend.py
@@ -34,6 +34,7 @@
 arg_to_attr = {
         'lookthroughlimit': 'nsslapd-lookthroughlimit',
         'mode': 'nsslapd-mode',
+        'state': 'nsslapd-state',
         'idlistscanlimit': 'nsslapd-idlistscanlimit',
         'directory': 'nsslapd-directory',
         'dbcachesize': 'nsslapd-dbcachesize',
@@ -156,7 +157,18 @@ def backend_list(inst, basedn, log, args):
 
 def backend_get(inst, basedn, log, args):
     rdn = _get_arg(args.selector, msg="Enter %s to retrieve" % RDN)
-    _generic_get(inst, basedn, log.getChild('backend_get'), MANY, rdn, args)
+    be = _get_backend(inst, rdn)
+    be_state = be.get_state()
+    if args.json:
+        entry = be.get_all_attrs_json()
+        entry_dict = json.loads(entry)
+        entry_dict['attrs']['nsslapd-state'] = [be_state]
+        log.info(json.dumps(entry_dict, indent=4))
+    else:
+        entry = be.display()
+        updated_entry = entry[:-1]  # remove \n
+        updated_entry += "nsslapd-state: " + be_state
+        log.info(updated_entry)
 
 
 def backend_get_dn(inst, basedn, log, args):
@@ -478,6 +490,8 @@ def backend_set(inst, basedn, log, args):
         be.set('nsslapd-require-index', 'on')
     if args.ignore_index:
         be.set('nsslapd-require-index', 'off')
+    if args.state:
+        be.set_state(args.state)
     if args.enable:
         be.enable()
     if args.disable:
@@ -845,6 +859,7 @@ def create_parser(subparsers):
     set_backend_parser.add_argument('--cache-size', help='The maximum number of entries to keep in the entry cache')
     set_backend_parser.add_argument('--cache-memsize', help='The maximum size in bytes that the entry cache can grow to')
     set_backend_parser.add_argument('--dncache-memsize', help='The maximum size in bytes that the DN cache can grow to')
+    set_backend_parser.add_argument('--state', help='Change the backend state to: "database", "disabled", "referral", "referral on update"')
     set_backend_parser.add_argument('be_name', help='The backend name or suffix to delete')
 
     #########################################