diff --git a/src/components/App.tsx b/src/components/App.tsx
index c48ac52fe..2245b9840 100755
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,21 +1,30 @@
 import React, { Component } from 'react';
-import { Page } from '@patternfly/react-core';
+import { Page, PageSidebar } from '@patternfly/react-core';
 import { Provider } from 'react-redux';
 
 import Header from './ui/Header';
 import BackgroundImage from './ui/BackgroundImage';
 import ClusterWizard from './ClusterWizard';
-import HostsExample from './HostsExample';
+import ClusterWizardSteps from './ClusterWizardSteps';
+// import HostsExample from './HostsExample';
 import { store } from '../store';
 
 class App extends Component {
   render(): JSX.Element {
+    const currentStep = 1;
     return (
       <Provider store={store}>
         <BackgroundImage />
-        <Page header={<Header />}>
-          <ClusterWizard />
-          <HostsExample />
+        <Page
+          header={<Header />}
+          sidebar={
+            <PageSidebar
+              nav={<ClusterWizardSteps currentStepIndex={currentStep} />}
+            />
+          }
+        >
+          <ClusterWizard currentStepIndex={currentStep} />
+          {/* <HostsExample /> */}
         </Page>
       </Provider>
     );
diff --git a/src/components/ClusterWizard.tsx b/src/components/ClusterWizard.tsx
index 3011d4d17..0f338c134 100644
--- a/src/components/ClusterWizard.tsx
+++ b/src/components/ClusterWizard.tsx
@@ -1,18 +1,19 @@
 import React, { FC, Fragment } from 'react';
 
-// import BaremetalInventory from './BaremetalInventory';
+import BaremetalInventory from './BaremetalInventory';
 import ClusterWizardNav from './ClusterWizardNav';
-// import ClusterWizardSteps from './ClusterWizardSteps';
 import CreateClusterForm from './createCluster/CreateClusterForm';
 
-const ClusterWizard: FC = (): JSX.Element => (
+interface ClusterWizardProps {
+  currentStepIndex: number;
+}
+
+const ClusterWizard: FC<ClusterWizardProps> = ({
+  currentStepIndex
+}: ClusterWizardProps): JSX.Element => (
   <Fragment>
-    {/* <ClusterWizardSteps
-      steps={[{ title: 'First' }, { title: 'Second' }]}
-      currentStepIndex={0}
-    /> */}
-    {/* <BaremetalInventory /> */}
-    <CreateClusterForm />
+    {currentStepIndex === 0 && <CreateClusterForm />}
+    {currentStepIndex === 1 && <BaremetalInventory />}
     <ClusterWizardNav />
   </Fragment>
 );
diff --git a/src/components/ClusterWizardStep.tsx b/src/components/ClusterWizardStep.tsx
deleted file mode 100644
index 9f19f571a..000000000
--- a/src/components/ClusterWizardStep.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { FC } from 'react';
-import { ListItem, TextContent, Text } from '@patternfly/react-core';
-
-interface ClusterWizardStepProps {
-  index: number;
-  title: string;
-  currentStepIndex: number;
-}
-
-const ClusterWizardStep: FC<ClusterWizardStepProps> = ({
-  index,
-  title,
-  currentStepIndex
-}: ClusterWizardStepProps): JSX.Element => (
-  <ListItem>
-    <TextContent>
-      <Text
-        component="h1"
-        style={currentStepIndex == index ? { color: 'red' } : undefined}
-      >
-        ({index}.) {title}
-      </Text>
-    </TextContent>
-  </ListItem>
-);
-
-export default ClusterWizardStep;
diff --git a/src/components/ClusterWizardSteps.tsx b/src/components/ClusterWizardSteps.tsx
index aa98c4659..83b74547c 100644
--- a/src/components/ClusterWizardSteps.tsx
+++ b/src/components/ClusterWizardSteps.tsx
@@ -1,34 +1,45 @@
 import React, { FC } from 'react';
-import { List, PageSectionVariants } from '@patternfly/react-core';
-import ClusterWizardStep from './ClusterWizardStep';
-
-import PageSection from './ui/PageSection';
-
-interface ClusterWizardStep {
-  title: string;
-}
+import { Nav, NavList, NavItem } from '@patternfly/react-core';
 
 interface ClusterWizardStepsProps {
-  steps: ClusterWizardStep[];
   currentStepIndex: number;
 }
 
 const ClusterWizardSteps: FC<ClusterWizardStepsProps> = ({
-  steps,
   currentStepIndex
 }: ClusterWizardStepsProps): JSX.Element => (
-  <PageSection variant={PageSectionVariants.light}>
-    <List variant="inline">
-      {steps.map((step, index) => (
-        <ClusterWizardStep
-          key={index}
-          index={index}
-          currentStepIndex={currentStepIndex}
-          {...step}
-        />
-      ))}
-    </List>
-  </PageSection>
+  <Nav
+    onToggle={() => {}}
+    onSelect={() => {}}
+    aria-label="Cluster deployment wizard steps"
+  >
+    <NavList>
+      <NavItem
+        id="cluster-wizard-steps-cluster-setup"
+        to="#"
+        itemId={0}
+        isActive={currentStepIndex === 0}
+      >
+        1. Cluster setup
+      </NavItem>
+      <NavItem
+        id="cluster-wizard-steps-add-hosts"
+        to="#"
+        itemId={1}
+        isActive={currentStepIndex === 1}
+      >
+        2. Add hosts
+      </NavItem>
+      <NavItem
+        id="cluster-wizard-steps-results"
+        to="#"
+        itemId={2}
+        isActive={currentStepIndex === 2}
+      >
+        3. Results
+      </NavItem>
+    </NavList>
+  </Nav>
 );
 
 export default ClusterWizardSteps;