diff --git a/packages/hawtio/src/help/HawtioHelp.tsx b/packages/hawtio/src/help/HawtioHelp.tsx
index f09aa03c3..593447d87 100644
--- a/packages/hawtio/src/help/HawtioHelp.tsx
+++ b/packages/hawtio/src/help/HawtioHelp.tsx
@@ -1,11 +1,9 @@
 import {
-  Card,
   CardBody,
+  Divider,
   Nav,
   NavItem,
   NavList,
-  PageGroup,
-  PageNavigation,
   PageSection,
   PageSectionVariants,
   TextContent,
@@ -40,38 +38,37 @@ export const HawtioHelp: React.FunctionComponent = () => {
       <PageSection variant={PageSectionVariants.light}>
         <Title headingLevel='h1'>Help</Title>
       </PageSection>
-      <PageGroup>
-        <PageNavigation>
-          <Nav aria-label='Nav' variant='tertiary'>
-            <NavList>
-              {helps.map(help => (
-                <NavItem key={help.id} isActive={location.pathname === `/help/${help.id}`}>
-                  <NavLink to={help.id}>{help.title}</NavLink>
-                </NavItem>
-              ))}
-            </NavList>
-          </Nav>
-        </PageNavigation>
-      </PageGroup>
-      <PageSection>
-        <Card isFullHeight>
-          <Routes>
-            {helpRegistry.getHelps().map(help => (
-              <Route
-                key={help.id}
-                path={help.id}
-                element={
-                  <CardBody>
-                    <TextContent>
-                      <Markdown>{help.content}</Markdown>
-                    </TextContent>
-                  </CardBody>
-                }
-              />
+      <Divider />
+
+      <PageSection type='tabs' hasShadowBottom>
+        <Nav aria-label='Nav' variant='tertiary'>
+          <NavList>
+            {helps.map(help => (
+              <NavItem key={help.id} isActive={location.pathname === `/help/${help.id}`}>
+                <NavLink to={help.id}>{help.title}</NavLink>
+              </NavItem>
             ))}
-            <Route path='/' element={<Navigate to='home' />} />
-          </Routes>
-        </Card>
+          </NavList>
+        </Nav>
+      </PageSection>
+      <Divider />
+      <PageSection variant={PageSectionVariants.light}>
+        <Routes>
+          {helpRegistry.getHelps().map(help => (
+            <Route
+              key={help.id}
+              path={help.id}
+              element={
+                <CardBody>
+                  <TextContent>
+                    <Markdown>{help.content}</Markdown>
+                  </TextContent>
+                </CardBody>
+              }
+            />
+          ))}
+          <Route path='/' element={<Navigate to='home' />} />
+        </Routes>
       </PageSection>
     </React.Fragment>
   )
diff --git a/packages/hawtio/src/preferences/HomePreferences.tsx b/packages/hawtio/src/preferences/HomePreferences.tsx
index 9e531d6a9..d00ca57e6 100644
--- a/packages/hawtio/src/preferences/HomePreferences.tsx
+++ b/packages/hawtio/src/preferences/HomePreferences.tsx
@@ -94,7 +94,7 @@ const ResetForm: React.FunctionComponent = () => {
         <FormHelperText>
           <HelperText>
             <HelperTextItem>
-              Clear all custom settings stored in your browser `&apos;`s local storage and reset to defaults.
+              Clear all custom settings stored in your browser`s local storage and reset to defaults.
             </HelperTextItem>
           </HelperText>
         </FormHelperText>