diff --git a/package-lock.json b/package-lock.json
index 3ec2626b..bc3c2ccd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8871,9 +8871,9 @@
       }
     },
     "node_modules/madwizard": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/madwizard/-/madwizard-1.0.3.tgz",
-      "integrity": "sha512-U73HXwvSK2C+40gDV7OQRLMky/V2ou1GeTSnHtwpDYx0WllLKNV1m1ynMShMZ1avQMNAZM/zZ1xbPIyaULy/Tw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/madwizard/-/madwizard-1.1.0.tgz",
+      "integrity": "sha512-8ztAITScM20mWiAFrtzNxM2mFO44Mf34GegpSupscGQnn38etKkWhU6gfRc2ePMpHvUt0spfBz+lw94gNVTfRQ==",
       "dependencies": {
         "chalk": "^5.0.1",
         "cli-highlight": "^2.1.11",
@@ -15950,7 +15950,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@guidebooks/store": "^0.14.1",
-        "madwizard": "^1.0.3"
+        "madwizard": "^1.1.0"
       }
     }
   },
@@ -16656,7 +16656,7 @@
       "version": "file:plugins/plugin-madwizard",
       "requires": {
         "@guidebooks/store": "^0.14.1",
-        "madwizard": "^1.0.3"
+        "madwizard": "^1.1.0"
       }
     },
     "@kui-shell/plugin-patternfly4-themes": {
@@ -22603,9 +22603,9 @@
       }
     },
     "madwizard": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/madwizard/-/madwizard-1.0.3.tgz",
-      "integrity": "sha512-U73HXwvSK2C+40gDV7OQRLMky/V2ou1GeTSnHtwpDYx0WllLKNV1m1ynMShMZ1avQMNAZM/zZ1xbPIyaULy/Tw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/madwizard/-/madwizard-1.1.0.tgz",
+      "integrity": "sha512-8ztAITScM20mWiAFrtzNxM2mFO44Mf34GegpSupscGQnn38etKkWhU6gfRc2ePMpHvUt0spfBz+lw94gNVTfRQ==",
       "requires": {
         "chalk": "^5.0.1",
         "cli-highlight": "^2.1.11",
diff --git a/plugins/plugin-codeflare/src/components/DashboardSelect.tsx b/plugins/plugin-codeflare/src/components/DashboardSelect.tsx
index a96a4a81..46851874 100644
--- a/plugins/plugin-codeflare/src/components/DashboardSelect.tsx
+++ b/plugins/plugin-codeflare/src/components/DashboardSelect.tsx
@@ -16,7 +16,7 @@
 
 import React from "react"
 import { openWindow } from "../controller/profile/actions"
-import { Select, SelectOption, SelectOptionObject, SelectVariant } from "@patternfly/react-core"
+import { Select, SelectOption, SelectOptionObject } from "@patternfly/react-core"
 
 type Props = {
   selectedProfile?: string
@@ -62,7 +62,8 @@ export default class DashboardSelect extends React.PureComponent<Props, State> {
   public render() {
     return (
       <Select
-        variant={SelectVariant.single}
+        variant="single"
+        direction="up"
         placeholderText="Dashboards"
         aria-label="Dashboards selector"
         onToggle={this._dashboardSelectOnToggle}
diff --git a/plugins/plugin-codeflare/src/components/ProfileExplorer.tsx b/plugins/plugin-codeflare/src/components/ProfileExplorer.tsx
index 741b41be..8397cf43 100644
--- a/plugins/plugin-codeflare/src/components/ProfileExplorer.tsx
+++ b/plugins/plugin-codeflare/src/components/ProfileExplorer.tsx
@@ -16,7 +16,7 @@
 
 import React from "react"
 import { Profiles } from "madwizard"
-import { Loading } from "@kui-shell/plugin-client-common"
+import { Icons, Loading, Tooltip } from "@kui-shell/plugin-client-common"
 import {
   Card,
   CardActions,
@@ -50,6 +50,7 @@ import "../../web/scss/components/ProfileExplorer/_index.scss"
 
 type Props = {
   onSelectProfile?(profile: string): void
+  onSelectGuidebook?(guidebook: string): void
 }
 
 type State = {
@@ -68,6 +69,9 @@ type Group = { title: string; name?: string }
 /** Metadata for tree node */
 type Metadata = { title: string; group: Group }
 
+/** */
+type TreeViewDataItemWithChildren = TreeViewDataItem & Required<Pick<TreeViewDataItem, "children">>
+
 export default class ProfileExplorer extends React.PureComponent<Props, State> {
   public constructor(props: Props) {
     super(props)
@@ -176,6 +180,7 @@ export default class ProfileExplorer extends React.PureComponent<Props, State> {
             profile={this.state.selectedProfile}
             profiles={this.state.profiles}
             onSelectProfile={this._handleProfileSelection}
+            onSelectGuidebook={this.props.onSelectGuidebook}
             profileReadiness={this.state.statusWatcher?.readiness}
             profileStatus={this.state.statusWatcher}
           />
@@ -185,7 +190,7 @@ export default class ProfileExplorer extends React.PureComponent<Props, State> {
   }
 }
 
-type ProfileCardProps = {
+type ProfileCardProps = Pick<Props, "onSelectGuidebook"> & {
   profile: string
   profiles: Profiles.Profile[]
   onSelectProfile: (profile: string) => void
@@ -274,7 +279,7 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
       title: "Cluster",
       group: this.groups.Compute,
     },
-    "kubernetes/choose/ns-with-context": {
+    "kubernetes/choose/ns": {
       title: "Namespace",
       group: this.groups.Compute,
     },
@@ -285,7 +290,7 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
       <ChipGroup numChips={10}>
         {Object.entries(form).map(([title, name]) => (
           <Chip key={title} isReadOnly textMaxWidth="25ch">
-            <span className="slightly-deemphasize">{title}</span> <span className="semi-bold color-base0F">{name}</span>
+            <span className="slightly-deemphasize">{title}</span> <span className="semi-bold color-base0D">{name}</span>
           </Chip>
         ))}
       </ChipGroup>
@@ -308,6 +313,35 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
     }
   }
 
+  private readonly onEdit = (evt: React.MouseEvent) => {
+    const guidebook = evt.currentTarget.getAttribute("data-guidebook")
+    if (guidebook) {
+      if (this.props.onSelectGuidebook) {
+        this.props.onSelectGuidebook(guidebook)
+      }
+    } else {
+      console.error("Missing guidebook attribute")
+    }
+  }
+
+  private editable<T extends TreeViewDataItem>(guidebook: string, node: T) {
+    return Object.assign(node, {
+      action: (
+        <Tooltip markdown={`### Update\n#### ${guidebook}\n\nClick to update this choice`}>
+          <Button
+            variant="plain"
+            aria-label="Edit"
+            data-guidebook={guidebook}
+            onClick={this.onEdit}
+            className="codeflare--profile-explorer-edit-button"
+          >
+            <Icons icon="Edit" />
+          </Button>
+        </Tooltip>
+      ),
+    })
+  }
+
   private body() {
     // TODO: Retrieve real data and abstract to its own component
     const profile = this.props.profiles.find((_) => _.name === this.props.profile)
@@ -328,13 +362,19 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
             }
             const { children } = groups[meta.group.title]
 
-            children.push(this.treeNode(meta, value))
+            children.push(this.editable(title, this.treeNode(meta, value)))
           }
 
           return groups
-        }, {} as Record<string, TreeViewDataItem & Required<Pick<TreeViewDataItem, "children">>>)
+        }, {} as Record<string, TreeViewDataItemWithChildren>)
 
       const data = Object.values(tree)
+      if (data.length === 0) {
+        // oops, this profile has no "shape", no choices have been
+        // made for us to visualize
+        data.push({ name: "Empty", children: [] })
+      }
+
       return <TreeView hasGuides defaultAllExpanded data={data} variant="compactNoBackground" />
     }
 
@@ -366,7 +406,7 @@ class ProfileCard extends React.PureComponent<ProfileCardProps, ProfileCardState
 
   public render() {
     return (
-      <Card className="top-pad left-pad right-pad bottompad" isSelectableRaised isSelected>
+      <Card className="top-pad left-pad right-pad bottom-pad" isSelectableRaised isSelected>
         <CardHeader>
           <CardTitle>{this.title()}</CardTitle>
           <CardActions hasNoOffset>{this.actions()}</CardActions>
diff --git a/plugins/plugin-codeflare/src/components/SelectedProfileTerminal.tsx b/plugins/plugin-codeflare/src/components/SelectedProfileTerminal.tsx
index 2d22f067..b2080f8c 100644
--- a/plugins/plugin-codeflare/src/components/SelectedProfileTerminal.tsx
+++ b/plugins/plugin-codeflare/src/components/SelectedProfileTerminal.tsx
@@ -41,6 +41,6 @@ export default class SelectedProfileTerminal extends React.PureComponent<MyProps
   }
 
   public render() {
-    return <RestartableTerminal key={this.state.cmdline} {...this.props} cmdline={this.state.cmdline} />
+    return <RestartableTerminal {...this.props} cmdline={this.state.cmdline} />
   }
 }
diff --git a/plugins/plugin-codeflare/src/controller/terminal.tsx b/plugins/plugin-codeflare/src/controller/terminal.tsx
index aeece082..317af9b6 100644
--- a/plugins/plugin-codeflare/src/controller/terminal.tsx
+++ b/plugins/plugin-codeflare/src/controller/terminal.tsx
@@ -43,10 +43,23 @@ export async function shell(args: Arguments) {
 }
 
 type Props = Pick<BaseProps, "tab" | "repl">
-type State = Partial<Pick<BaseProps, "cmdline" | "env">> & { error?: boolean; selectedProfile?: string }
+type State = Partial<Pick<BaseProps, "cmdline" | "env">> & {
+  /** Internal error in rendering */
+  error?: boolean
+
+  /** Use this guidebook in the terminal execution */
+  guidebook?: string
+
+  /** Use this profile in the terminal execution */
+  selectedProfile?: string
+}
+
 class TaskTerminal extends React.PureComponent<Props, State> {
+  /** Default guidebook to show in the terminal */
+  private readonly defaultGuidebook = "ml/codeflare"
+
   /** Allotment initial split sizes */
-  private readonly sizes = [35, 65]
+  private readonly sizes = [40, 60]
 
   private readonly tasks = [{ label: "Run a Job", argv: ["codeflare", "-p", "${SELECTED_PROFILE}"] }]
 
@@ -57,11 +70,17 @@ class TaskTerminal extends React.PureComponent<Props, State> {
     this.state = {}
   }
 
-  private async init() {
+  private async init(guidebook?: string) {
     try {
       // respawn, meaning launch it with codeflare
       const { argv, env } = await respawn(this.tasks[0].argv)
-      const cmdline = argv.map((_) => encodeComponent(_)).join(" ")
+      const cmdline = [
+        ...argv.map((_) => encodeComponent(_)),
+        guidebook || this.defaultGuidebook,
+        ...(guidebook ? ["--ifor", guidebook] : []),
+      ]
+        .filter(Boolean)
+        .join(" ")
 
       this.setState({
         cmdline,
@@ -69,14 +88,18 @@ class TaskTerminal extends React.PureComponent<Props, State> {
       })
     } catch (error) {
       console.error("Error initializing command line", error)
-      this.state = {
+      this.setState({
         error: true,
-      }
+      })
     }
   }
 
+  /** Event handler for switching to a different profile */
   private readonly onSelectProfile = (selectedProfile: string) => this.setState({ selectedProfile })
 
+  /** Event handler for switching to a different guidebook */
+  private readonly onSelectGuidebook = (guidebook: string) => this.init(guidebook)
+
   public static getDerivedStateFromError() {
     return { error: true }
   }
@@ -94,7 +117,7 @@ class TaskTerminal extends React.PureComponent<Props, State> {
     return (
       <Allotment defaultSizes={this.sizes} snap>
         <Allotment.Pane className="flex-fill flex-layout flex-align-stretch" minSize={400}>
-          <ProfileExplorer onSelectProfile={this.onSelectProfile} />
+          <ProfileExplorer onSelectProfile={this.onSelectProfile} onSelectGuidebook={this.onSelectGuidebook} />
         </Allotment.Pane>
         <Allotment.Pane className="flex-fill flex-layout flex-align-stretch">
           {!this.state.selectedProfile ? (
diff --git a/plugins/plugin-codeflare/web/scss/components/ProfileExplorer/_index.scss b/plugins/plugin-codeflare/web/scss/components/ProfileExplorer/_index.scss
index 77038e97..ce4344a3 100644
--- a/plugins/plugin-codeflare/web/scss/components/ProfileExplorer/_index.scss
+++ b/plugins/plugin-codeflare/web/scss/components/ProfileExplorer/_index.scss
@@ -26,6 +26,12 @@
   }
 }
 
+@mixin EditButton {
+  button.codeflare--profile-explorer-edit-button {
+    @content;
+  }
+}
+
 @include ProfileExplorer {
   display: flex;
   .pf-c-card__body {
@@ -34,8 +40,17 @@
 
   font-family: var(--font-sans-serif);
 
-  button {
-    color: var(--color-text-01) !important;
+  .pf-c-card .pf-c-tree-view button.pf-c-tree-view__node {
+    color: var(--color-text-01);
+  }
+
+  .pf-c-tree-view {
+    @include EditButton {
+      color: var(--color-base04);
+      &:hover {
+        color: var(--color-text-01);
+      }
+    }
   }
 
   .pf-c-tree-view {
@@ -47,6 +62,11 @@
     --pf-c-tree-view--m-compact__node-container--nested--PaddingLeft: 1.5em;
   }
 
+  .pf-c-tree-view__content {
+    /* so that action items align top */
+    align-items: flex-start;
+  }
+
   .pf-c-tree-view__node-text {
     color: var(--color-text-02);
   }
diff --git a/plugins/plugin-madwizard/package.json b/plugins/plugin-madwizard/package.json
index d14bd45c..370015b3 100644
--- a/plugins/plugin-madwizard/package.json
+++ b/plugins/plugin-madwizard/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "madwizard": "^1.0.3",
+    "madwizard": "^1.1.0",
     "@guidebooks/store": "^0.14.1"
   }
 }
diff --git a/plugins/plugin-madwizard/src/plugin.ts b/plugins/plugin-madwizard/src/plugin.ts
index e398524c..ead2807f 100644
--- a/plugins/plugin-madwizard/src/plugin.ts
+++ b/plugins/plugin-madwizard/src/plugin.ts
@@ -65,6 +65,12 @@ export interface Options extends ParsedOptions {
   /** Interactive guide mode? [default: false] */
   interactive: boolean
 
+  /** Interactive guide mode only for last question? [default: false] */
+  z: boolean
+
+  /** Interactive guide mode only for the given notebook? [default: false] */
+  ifor: string
+
   /** Use team-focused assertions */
   team?: string
 }
@@ -140,7 +146,8 @@ export function doMadwizard({ readonlyUI = true, task, withFilepath = true, cb,
           profilesPath: parsedOptions["profiles-path"] || parsedOptions.P,
           store: parsedOptions.s || process.env.GUIDEBOOK_STORE,
           verbose: parsedOptions.V,
-          interactive: parsedOptions.i || !parsedOptions.y,
+          ifor: parsedOptions.ifor, // interactive only for a given guidebook?
+          interactive: parsedOptions.i || (!parsedOptions.ifor && !parsedOptions.y),
           assertions: assertionsFn ? assertionsFn(parsedOptions) : undefined,
         }
       )
@@ -163,7 +170,7 @@ export function doMadwizard({ readonlyUI = true, task, withFilepath = true, cb,
 }
 
 export const flags = {
-  boolean: ["u", "V", "n", "q", "i", "y"],
+  boolean: ["u", "V", "n", "q", "i", "y", "z"],
   configuration: { "populate--": true },
   alias: {
     store: ["s"],