diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard.mdx
index eb6be3fd1e0..1147183b634 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard.mdx
@@ -17,6 +17,7 @@ breadcrumb:
     href: /uilib/extensions/forms/
   - text: Wizard
     href: /uilib/extensions/forms/Wizard/
+expanded: false
 ---
 
 import Info from 'Docs/uilib/extensions/forms/Wizard/info'
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons.mdx
index 1562fd8e06d..1b69a342d3d 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons.mdx
@@ -1,8 +1,7 @@
 ---
 title: 'Buttons'
 description: '`Wizard.Buttons` is a combination of PreviousButton and NextButton for navigating between steps/pages.'
-order: 10
-hideInMenu: true
+order: 30
 showTabs: true
 tabs:
   - title: Info
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/info.mdx
index 1e4849e036a..99625faaffc 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/info.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/info.mdx
@@ -4,7 +4,7 @@ showTabs: true
 
 ## Description
 
-`Wizard.Buttons` is a combination of [PreviousButton](/uilib/extensions/forms/Wizard/Buttons/PreviousButton/) and [NextButton](/uilib/extensions/forms/Wizard/Buttons/NextButton/) for navigating between steps/pages.
+`Wizard.Buttons` is a combination of [PreviousButton](/uilib/extensions/forms/Wizard/PreviousButton/) and [NextButton](/uilib/extensions/forms/Wizard/NextButton/) for navigating between steps/pages.
 
 Only the relevant button is shown, depending on the current step.
 
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Container.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Container.mdx
index f2df932cde1..8409bba3bf4 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Container.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Container.mdx
@@ -1,8 +1,7 @@
 ---
 title: 'Container'
 description: 'The `Wizard.Container` is a container component for multi-page forms including a step indicator.'
-order: 0
-hideInMenu: true
+order: 10
 showTabs: true
 tabs:
   - title: Info
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton.mdx
similarity index 58%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton.mdx
index a051e0ad2d7..8c6e508836c 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton.mdx
@@ -1,17 +1,15 @@
 ---
 title: 'EditButton'
 description: '`Wizard.EditButton` is a button to be placed in a summary step.'
-hideInMenu: true
+order: 40
 showTabs: true
 breadcrumb:
   - text: Forms
     href: /uilib/extensions/forms/
   - text: Wizard
     href: /uilib/extensions/forms/Wizard/
-  - text: Step
-    href: /uilib/extensions/forms/Wizard/Step/
   - text: EditButton
-    href: /uilib/extensions/forms/Wizard/Step/EditButton/
+    href: /uilib/extensions/forms/Wizard/EditButton/
 tabs:
   - title: Info
     key: '/info'
@@ -21,8 +19,8 @@ tabs:
     key: '/properties'
 ---
 
-import Info from 'Docs/uilib/extensions/forms/Wizard/Step/EditButton/info'
-import Demos from 'Docs/uilib/extensions/forms/Wizard/Step/EditButton/demos'
+import Info from 'Docs/uilib/extensions/forms/Wizard/EditButton/info'
+import Demos from 'Docs/uilib/extensions/forms/Wizard/EditButton/demos'
 
 <Info />
 <Demos />
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/demos.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/demos.mdx
similarity index 56%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/demos.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/demos.mdx
index 7258df3253a..f6ec3b48211 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/demos.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/demos.mdx
@@ -2,7 +2,7 @@
 showTabs: true
 ---
 
-import * as Examples from './../Examples'
+import * as Examples from '../Step/Examples'
 
 ## Demo
 
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/info.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/info.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/info.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/properties.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/properties.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/EditButton/properties.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/EditButton/properties.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton.mdx
similarity index 59%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton.mdx
index dc9c7aa24cd..a7153d71e1e 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton.mdx
@@ -1,17 +1,15 @@
 ---
 title: 'NextButton'
 description: '`Wizard.NextButton` connects to the `Wizard.Context` to move the user to the next step when clicked.'
-hideInMenu: true
+order: 50
 showTabs: true
 breadcrumb:
   - text: Forms
     href: /uilib/extensions/forms/
   - text: Wizard
     href: /uilib/extensions/forms/Wizard/
-  - text: Buttons
-    href: /uilib/extensions/forms/Wizard/Buttons/
   - text: NextButton
-    href: /uilib/extensions/forms/Wizard/Buttons/NextButton/
+    href: /uilib/extensions/forms/Wizard/NextButton/
 tabs:
   - title: Info
     key: '/info'
@@ -21,8 +19,8 @@ tabs:
     key: '/properties'
 ---
 
-import Info from 'Docs/uilib/extensions/forms/Wizard/Buttons/NextButton/info'
-import Demos from 'Docs/uilib/extensions/forms/Wizard/Buttons/NextButton/demos'
+import Info from 'Docs/uilib/extensions/forms/Wizard/NextButton/info'
+import Demos from 'Docs/uilib/extensions/forms/Wizard/NextButton/demos'
 
 <Info />
 <Demos />
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/Examples.tsx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/Examples.tsx
similarity index 86%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/Examples.tsx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/Examples.tsx
index 28c4289b266..b1b952e5651 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/Examples.tsx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/Examples.tsx
@@ -1,4 +1,4 @@
-import ComponentBox from '../../../../../../../shared/tags/ComponentBox'
+import ComponentBox from '../../../../../../shared/tags/ComponentBox'
 import { Wizard } from '@dnb/eufemia/src/extensions/forms'
 
 export const Default = () => {
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/demos.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/demos.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/demos.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/demos.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/info.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/info.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/info.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/properties.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/properties.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/NextButton/properties.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/NextButton/properties.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton.mdx
similarity index 59%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton.mdx
index 1b5c3c1ff5c..20dd224f678 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton.mdx
@@ -1,17 +1,15 @@
 ---
 title: 'PreviousButton'
 description: '`Wizard.PreviousButton` connects to the `Wizard.Context` to move the user to the previous step when clicked.'
-hideInMenu: true
+order: 60
 showTabs: true
 breadcrumb:
   - text: Forms
     href: /uilib/extensions/forms/
   - text: Wizard
     href: /uilib/extensions/forms/Wizard/
-  - text: Buttons
-    href: /uilib/extensions/forms/Wizard/Buttons/
   - text: PreviousButton
-    href: /uilib/extensions/forms/Wizard/Buttons/PreviousButton/
+    href: /uilib/extensions/forms/Wizard/PreviousButton/
 tabs:
   - title: Info
     key: '/info'
@@ -21,8 +19,8 @@ tabs:
     key: '/properties'
 ---
 
-import Info from 'Docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/info'
-import Demos from 'Docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/demos'
+import Info from 'Docs/uilib/extensions/forms/Wizard/PreviousButton/info'
+import Demos from 'Docs/uilib/extensions/forms/Wizard/PreviousButton/demos'
 
 <Info />
 <Demos />
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/Examples.tsx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/Examples.tsx
similarity index 86%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/Examples.tsx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/Examples.tsx
index d378199f302..9f94393b327 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/Examples.tsx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/Examples.tsx
@@ -1,4 +1,4 @@
-import ComponentBox from '../../../../../../../shared/tags/ComponentBox'
+import ComponentBox from '../../../../../../shared/tags/ComponentBox'
 import { Wizard } from '@dnb/eufemia/src/extensions/forms'
 
 export const Default = () => {
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/demos.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/demos.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/demos.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/demos.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/info.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/info.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/info.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/properties.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/properties.mdx
similarity index 100%
rename from packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Buttons/PreviousButton/properties.mdx
rename to packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/PreviousButton/properties.mdx
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step.mdx
index ff75fe24260..0b34cf635f6 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step.mdx
@@ -1,8 +1,7 @@
 ---
 title: 'Step'
 description: 'Each step should be wrapped with a `Wizard.Step` component directly inside Wizard.Container.'
-order: 1
-hideInMenu: true
+order: 20
 showTabs: true
 tabs:
   - title: Info
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/info.mdx
index 773f2037847..398ebae0c73 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/info.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/Step/info.mdx
@@ -40,4 +40,4 @@ It uses [Flex.Stack](/uilib/layout/flex/stack/) so you don't need to wrap your c
 
 ## EditButton
 
-In order to navigate back to another step, you can use the [EditButton](/uilib/extensions/forms/Wizard/Step/EditButton/) component.
+In order to navigate back to another step, you can use the [EditButton](/uilib/extensions/forms/Wizard/EditButton/) component.
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/location-hooks.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/location-hooks.mdx
index aac0975e523..c4f13687db6 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/location-hooks.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/location-hooks.mdx
@@ -1,8 +1,7 @@
 ---
 title: 'Location Hooks'
 description: 'Is a set of React Hooks that lets you easily hook up your existing router in order to store the current step in the URL query string.'
-order: 30
-hideInMenu: true
+order: 80
 showTabs: true
 tabs:
   - title: Info
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep.mdx
index 20555a12287..d66b103a8ab 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep.mdx
@@ -1,8 +1,7 @@
 ---
 title: 'useStep'
 description: '`Wizard.useStep` returns `Wizard.Context` parameters such as totalSteps, activeIndex or a setActiveIndex handler.'
-order: 20
-hideInMenu: true
+order: 70
 showTabs: true
 tabs:
   - title: Info
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep/info.mdx
index cad4fb53a41..0b743c3b7ac 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep/info.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/Wizard/useStep/info.mdx
@@ -47,4 +47,4 @@ function MyForm() {
 
 ## EditButton
 
-In order to navigate to a new step when using `setActiveIndex` you can use the [EditButton](/uilib/extensions/forms/Wizard/Step/EditButton/) component.
+In order to navigate to a new step when using `setActiveIndex` you can use the [EditButton](/uilib/extensions/forms/Wizard/EditButton/) component.