diff --git a/.gitignore b/.gitignore
index 9fd8f3f3..862ddd1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ AGENTS.override.md
 .claude/*.local.*
 .claude/settings*.json
 .claude/pr/*
+.claude/worktrees/
 .mcp*
 .tmp
 .pi-subagents
diff --git a/src/pages/function-list/components/EmptyState.tsx b/src/pages/function-list/components/EmptyState.tsx
index 1ba8b8cf..ffa87c43 100644
--- a/src/pages/function-list/components/EmptyState.tsx
+++ b/src/pages/function-list/components/EmptyState.tsx
@@ -25,9 +25,7 @@ export function FunctionsEmptyState({ isCreateDisabled }: FunctionsEmptyStatePro
               "A GitHub Personal Access Token is required to create functions. Click 'Connect to GitHub' in the top-right corner to connect. Once connected, the create button will be enabled.",
             )
           : t('Create a serverless function to get started.')}
-        <div className="pf-v6-u-mt-sm">
-          <SetupGuide />
-        </div>
+        <SetupGuide className="pf-v6-u-display-block pf-v6-u-mx-auto pf-v6-u-mt-sm" />
       </EmptyStateBody>
       <EmptyStateFooter>
         <EmptyStateActions>
diff --git a/src/pages/function-list/components/SetupGuide.tsx b/src/pages/function-list/components/SetupGuide.tsx
index 50ca363d..bb22c0cf 100644
--- a/src/pages/function-list/components/SetupGuide.tsx
+++ b/src/pages/function-list/components/SetupGuide.tsx
@@ -1,8 +1,6 @@
 import {
   Button,
   Content,
-  List,
-  ListItem,
   Modal,
   ModalBody,
   ModalFooter,
@@ -11,18 +9,13 @@ import {
 import { ReactNode, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-export function SetupGuide() {
+export function SetupGuide({ className }: { className?: string }) {
   const { t } = useTranslation('plugin__console-functions-plugin');
   const [isOpen, setIsOpen] = useState(false);
 
   return (
     <>
-      <Button
-        variant="link"
-        isInline
-        onClick={() => setIsOpen(true)}
-        data-test="setup-guide-button"
-      >
+      <Button variant="link" isInline onClick={() => setIsOpen(true)} className={className}>
         {t('View setup guide.')}
       </Button>
       <SetupGuideModal isOpen={isOpen} onClose={() => setIsOpen(false)} />
@@ -39,25 +32,25 @@ function SetupGuideModal({ isOpen, onClose }: SetupGuideModalProps) {
   const { t } = useTranslation('plugin__console-functions-plugin');
 
   return (
-    <Modal isOpen={isOpen} onClose={onClose} variant="medium" data-test="setup-guide-modal">
+    <Modal isOpen={isOpen} onClose={onClose} variant="medium">
       <ModalHeader title={t('Set up guide')} />
       <ModalBody>
         <Content component="p">
           {t('Follow these steps to create and deploy your serverless function.')}
         </Content>
-        <List component="ol" className="pf-v6-u-mt-md">
+        <Content component="ol" className="pf-v6-u-mt-md">
           {steps(t).map((step) => (
-            <ListItem key={step.title}>
-              <Content component="p">
-                <strong>{step.title}</strong>
+            <Content component="li" key={step.title}>
+              <Content component="p" className="pf-v6-u-font-weight-bold">
+                {step.title}
               </Content>
               <Content component="p">{step.body}</Content>
-            </ListItem>
+            </Content>
           ))}
-        </List>
+        </Content>
       </ModalBody>
       <ModalFooter>
-        <Button variant="primary" onClick={onClose} data-test="setup-guide-close-button">
+        <Button variant="primary" onClick={onClose}>
           {t('Close')}
         </Button>
       </ModalFooter>