diff --git a/src/App.jsx b/src/App.jsx
index cabdf6ddfa..3952904781 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -14,7 +14,10 @@ import {
   NavItem,
   Page,
   PageHeader,
-  PageSidebar
+  PageSidebar,
+  Toolbar,
+  ToolbarGroup,
+  ToolbarItem
 } from '@patternfly/react-core';
 import { global_breakpoint_md as breakpointMd } from '@patternfly/react-tokens';
 
@@ -87,6 +90,16 @@ class App extends React.Component {
     const { activeItem, activeGroup, isNavOpen } = this.state;
     const { logo, loginInfo } = this.props;
 
+    const PageToolbar = (
+      <Toolbar>
+        <ToolbarGroup>
+          <ToolbarItem>
+            <LogoutButton onDevLogout={() => this.onDevLogout()} />
+          </ToolbarItem>
+        </ToolbarGroup>
+      </Toolbar>
+    );
+
     return (
       <Router>
         <Fragment>
@@ -110,7 +123,7 @@ class App extends React.Component {
                 header={(
                   <PageHeader
                     logo={<TowerLogo onClick={this.onLogoClick} />}
-                    avatar={<LogoutButton onDevLogout={() => this.onDevLogout()} />}
+                    toolbar={PageToolbar}
                     showNavToggle
                     onNavToggle={this.onNavToggle}
                   />
@@ -329,6 +342,7 @@ class App extends React.Component {
                     )}
                   />
                 )}
+                useCondensed
               >
                 <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" exact path="/" component={() => (<Redirect to="/home" />)} />
                 <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/home" component={Dashboard} />
diff --git a/src/app.scss b/src/app.scss
index 21548b6901..d31a962175 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -1,56 +1,24 @@
 //
-// page layout
+// masthead overrides
 //
 
-.pf-l-page__header {
-  --pf-l-page__header--MinHeight: 0px;
-  display: flex;
-  align-items: center;
-  height: 60px;
-}
-
 .pf-l-page__header-brand {
-  display: flex;
-  align-self: center;
-  height: 60px;
   max-width: 255px;
-  padding: 0px;
-  margin: 0px;
-}
-
-.pf-l-page__header-tools {
-  align-self: center;
-  height: 60px;
-  padding-left: 255px;
-
-  .fa-user:hover {
-    // temporary dev logout
-    cursor: pointer;
-  }
 }
 
 .pf-l-page__header-brand-link {
   max-width: 85px;
-  align-self: center;
 }
 
 .pf-l-page__header-brand-link img {
   transform: scale(1.1, 1.1);
   position: relative;
-  top: 6px;
+  top: -4px;
 }
 
-.pf-l-page__header-brand-toggle {
-  align-self: center;
-  position: relative;
-  right: 14px;
-  --pf-l-page__header-brand-link--MarginLeft: 0px;
-  --pf-l-page__header-brand-link--MarginLeft: 0px;
-
-  button {
-    --pf-l-page__header-sidebar-toggle--FontSize: 18px;
-  }
-}
+//
+// sidebar overrides
+//
 
 .pf-l-page__sidebar{
   --pf-l-page__sidebar--Width--lg: 255px;
@@ -84,16 +52,11 @@
   }
 }
 
-.pf-l-page__main-section {
-  --pf-l-page__main-section--PaddingTop: 11px;
-  --pf-l-page__main-section--PaddingLeft: 11px;
-}
-
 //
-// toolbar layout
+// page header overrides
 //
 
-.pf-l-toolbar {
-  align-self: center;
-  height: 60px;
+.pf-l-page__main-section.pf-m-condensed {
+  padding-top: 16px;
+  padding-bottom: 16px;
 }
\ No newline at end of file
diff --git a/src/pages/Applications.jsx b/src/pages/Applications.jsx
index 9b3fa397a2..592d0fda0c 100644
--- a/src/pages/Applications.jsx
+++ b/src/pages/Applications.jsx
@@ -11,7 +11,7 @@ class Applications extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Applications</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Applications</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/AuthSettings.jsx b/src/pages/AuthSettings.jsx
index 80da23f545..c020a8b3d7 100644
--- a/src/pages/AuthSettings.jsx
+++ b/src/pages/AuthSettings.jsx
@@ -11,7 +11,7 @@ class AuthSettings extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Authentication Settings</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Authentication Settings</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/CredentialTypes.jsx b/src/pages/CredentialTypes.jsx
index e2ee4acb40..794748519c 100644
--- a/src/pages/CredentialTypes.jsx
+++ b/src/pages/CredentialTypes.jsx
@@ -11,7 +11,7 @@ class CredentialTypes extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Credential Types</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Credential Types</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Credentials.jsx b/src/pages/Credentials.jsx
index 9b148b1c89..e62631634b 100644
--- a/src/pages/Credentials.jsx
+++ b/src/pages/Credentials.jsx
@@ -11,7 +11,7 @@ class Credentials extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Credentials</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Credentials</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx
index 4997ac8b75..19af5abf26 100644
--- a/src/pages/Dashboard.jsx
+++ b/src/pages/Dashboard.jsx
@@ -11,7 +11,7 @@ class Dashboard extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Dashboard</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Dashboard</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/InstanceGroups.jsx b/src/pages/InstanceGroups.jsx
index fa10b6c196..c96817f497 100644
--- a/src/pages/InstanceGroups.jsx
+++ b/src/pages/InstanceGroups.jsx
@@ -11,7 +11,7 @@ class InstanceGroups extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Instance Groups</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Instance Groups</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Inventories.jsx b/src/pages/Inventories.jsx
index c4b0c13313..ff11799bbf 100644
--- a/src/pages/Inventories.jsx
+++ b/src/pages/Inventories.jsx
@@ -11,7 +11,7 @@ class Inventories extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Inventories</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Inventories</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/InventoryScripts.jsx b/src/pages/InventoryScripts.jsx
index 6795eb1e07..8fce7fbbf1 100644
--- a/src/pages/InventoryScripts.jsx
+++ b/src/pages/InventoryScripts.jsx
@@ -11,7 +11,7 @@ class InventoryScripts extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Inventory Scripts</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Inventory Scripts</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Jobs.jsx b/src/pages/Jobs.jsx
index 08b89efa26..dc8603c928 100644
--- a/src/pages/Jobs.jsx
+++ b/src/pages/Jobs.jsx
@@ -11,7 +11,7 @@ class Jobs extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Jobz</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Jobz</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/JobsSettings.jsx b/src/pages/JobsSettings.jsx
index cdc2b97ba7..57a92bfc13 100644
--- a/src/pages/JobsSettings.jsx
+++ b/src/pages/JobsSettings.jsx
@@ -11,7 +11,7 @@ class JobsSettings extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Jobs Settings</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Jobs Settings</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/License.jsx b/src/pages/License.jsx
index b06add756a..57248fcaa0 100644
--- a/src/pages/License.jsx
+++ b/src/pages/License.jsx
@@ -11,7 +11,7 @@ class License extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">License</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">License</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/ManagementJobs.jsx b/src/pages/ManagementJobs.jsx
index 45d2ee7472..a92666639d 100644
--- a/src/pages/ManagementJobs.jsx
+++ b/src/pages/ManagementJobs.jsx
@@ -11,7 +11,7 @@ class ManagementJobs extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Management Jobs</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Management Jobs</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/NotificationTemplates.jsx b/src/pages/NotificationTemplates.jsx
index a04e79e66a..d1e7580db3 100644
--- a/src/pages/NotificationTemplates.jsx
+++ b/src/pages/NotificationTemplates.jsx
@@ -11,7 +11,7 @@ class NotificationTemplates extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Notification Templates</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Notification Templates</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Organizations.jsx b/src/pages/Organizations.jsx
index 2339fe2b92..d987ede528 100644
--- a/src/pages/Organizations.jsx
+++ b/src/pages/Organizations.jsx
@@ -28,7 +28,7 @@ class Organizations extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}>
+        <PageSection variant={light} className="pf-m-condensed">
           <Title size="2xl">Organizations</Title>
         </PageSection>
         <PageSection variant={medium}>
diff --git a/src/pages/Portal.jsx b/src/pages/Portal.jsx
index 04ad86f2d1..ebd2544f6b 100644
--- a/src/pages/Portal.jsx
+++ b/src/pages/Portal.jsx
@@ -11,7 +11,7 @@ class Portal extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">My View</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">My View</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Projects.jsx b/src/pages/Projects.jsx
index b497e6b9e6..6c3c3123a6 100644
--- a/src/pages/Projects.jsx
+++ b/src/pages/Projects.jsx
@@ -11,7 +11,7 @@ class Projects extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Projects</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Projects</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Schedules.jsx b/src/pages/Schedules.jsx
index e7e9dcf89c..68b97aef45 100644
--- a/src/pages/Schedules.jsx
+++ b/src/pages/Schedules.jsx
@@ -11,7 +11,7 @@ class Schedules extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Schedules</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Schedules</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/SystemSettings.jsx b/src/pages/SystemSettings.jsx
index 2ecf2f3289..9b821d1666 100644
--- a/src/pages/SystemSettings.jsx
+++ b/src/pages/SystemSettings.jsx
@@ -11,7 +11,7 @@ class SystemSettings extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">System Settings</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">System Settings</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Teams.jsx b/src/pages/Teams.jsx
index e42826396c..48f127410d 100644
--- a/src/pages/Teams.jsx
+++ b/src/pages/Teams.jsx
@@ -11,7 +11,7 @@ class Teams extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Teams</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Teams</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Templates.jsx b/src/pages/Templates.jsx
index 97803c5bd8..58fec18914 100644
--- a/src/pages/Templates.jsx
+++ b/src/pages/Templates.jsx
@@ -11,7 +11,7 @@ class Templates extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Templates</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Templates</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/UISettings.jsx b/src/pages/UISettings.jsx
index 3753ec77eb..89e92a7586 100644
--- a/src/pages/UISettings.jsx
+++ b/src/pages/UISettings.jsx
@@ -11,7 +11,7 @@ class UISettings extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">User Interface Settings</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">User Interface Settings</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );
diff --git a/src/pages/Users.jsx b/src/pages/Users.jsx
index 4a34ec60d3..b098bab637 100644
--- a/src/pages/Users.jsx
+++ b/src/pages/Users.jsx
@@ -11,7 +11,7 @@ class Users extends Component {
 
     return (
       <Fragment>
-        <PageSection variant={light}><Title size="2xl">Users</Title></PageSection>
+        <PageSection variant={light} className="pf-m-condensed"><Title size="2xl">Users</Title></PageSection>
         <PageSection variant={medium} />
       </Fragment>
     );