diff --git a/src/components/AutoLinkHeader.tsx b/src/components/AutoLinkHeader.tsx
index d2608e5..4e5c539 100644
--- a/src/components/AutoLinkHeader.tsx
+++ b/src/components/AutoLinkHeader.tsx
@@ -1,4 +1,4 @@
-import { Flex, FlexItem, Content, Button } from '@patternfly/react-core'
+import { Flex, FlexItem, Content } from '@patternfly/react-core'
 import LinkIcon from '@patternfly/react-icons/dist/esm/icons/link-icon'
 import { slugger } from '../utils/slugger'
 import { css } from '@patternfly/react-styles'
@@ -33,20 +33,12 @@ export const AutoLinkHeader = ({
           tabIndex={-1}
           isEditorial
         >
-          <Button
-            href={`#${slug}`}
-            component="a"
-            className="ws-heading-anchor"
-            tabIndex={-1}
-            aria-hidden
-            variant="plain"
-            isInline
-          >
+          <a href={`#${slug}`} className="ws-heading-anchor" tabIndex={-1}>
             <LinkIcon
               className="ws-heading-anchor-icon"
               style={{ verticalAlign: 'middle' }}
             />
-          </Button>
+          </a>
           {children}
         </Content>
       </FlexItem>
diff --git a/src/components/DocsTables.astro b/src/components/DocsTables.astro
index 6a0300e..28fc699 100644
--- a/src/components/DocsTables.astro
+++ b/src/components/DocsTables.astro
@@ -15,7 +15,7 @@ const hasTables = !!propComponents || !!cssPrefix
     hasTables && (
       <Stack hasGutter>
         {propComponents && (
-          <StackItem>
+          <StackItem className="pf-v6-u-mt-md">
             <PropsTables
               propComponents={propComponents}
               url={url}
diff --git a/src/layouts/Main.astro b/src/layouts/Main.astro
index 99cb01c..4f7a021 100644
--- a/src/layouts/Main.astro
+++ b/src/layouts/Main.astro
@@ -1,5 +1,6 @@
 ---
 import '@patternfly/patternfly/patternfly.css'
+import '@patternfly/patternfly/patternfly-addons.css'
 import '../styles/global.scss'
 import { ClientRouter } from 'astro:transitions'