diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
index 86c1b003eb..2248ac83be 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Checklist.tsx
@@ -86,8 +86,13 @@ const Checklist: React.FC<Props> = React.memo((props) => {
           onContextMenu={handleContext}
           ref={drag}
         >
-          {Icon && <Icon />}
-          <span>{props.text}</span>
+          <div className="question-icon-wrapper">
+            {Icon && <Icon />}
+            <span className="question-text">{props.text}</span>
+          </div>
+          {props.data?.fn && (
+            <div className="question-schema">{props.data.fn}</div>
+          )}
         </Link>
         {groupedOptions ? (
           <ol className="categories">
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Option.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Option.tsx
index 8a48609f6e..0e34bab039 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Option.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Option.tsx
@@ -29,6 +29,7 @@ const Option: React.FC<any> = (props) => {
       <Link href={href} prefetch={false} onClick={(e) => e.preventDefault()}>
         <div className="band" style={{ background, color }}></div>
         <div className="text">{props.data.text}</div>
+        {props.data?.val && <div className="schema">{props.data?.val}</div>}
       </Link>
       <ol className="decisions">
         {childNodes.map((child: any) => (
diff --git a/editor.planx.uk/src/pages/FlowEditor/floweditor.scss b/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
index 8f51ad279b..f91c0d4fbd 100644
--- a/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
+++ b/editor.planx.uk/src/pages/FlowEditor/floweditor.scss
@@ -250,7 +250,7 @@ $fontMonospace: "Source Code Pro", monospace;
     flex-direction: column;
     padding: 0;
     min-width: 60px;
-    max-width: 200px;
+    max-width: fit-content;
   }
   .band {
     width: 100%;
@@ -261,6 +261,51 @@ $fontMonospace: "Source Code Pro", monospace;
     align-self: center;
     margin: 0;
     padding: 6px 12px;
+    width: 100%;
+    border-bottom: $nodeBorderWidth solid $optionBorder;
+  }
+  .schema {
+    background-color: $hangerBackground;
+    font-family: $fontMonospace;
+    align-self: center;
+    margin: 0;
+    margin-bottom: -$nodeBorderWidth;
+    padding: 6px 12px;
+    width: 100%;
+    border-bottom: $nodeBorderWidth solid $optionBorder;
+  }
+}
+
+.question {
+  > a {
+    border-color: $nodeBorder;
+    flex-direction: column;
+    padding: 0;
+    min-width: 60px;
+    max-width: 300px;
+  }
+  .question-icon-wrapper {
+    display: flex;
+    flex-direction: row;
+    padding: 6px;
+    width: 100%;
+    border-bottom: $nodeBorderWidth solid $nodeBorder;
+  }
+  .question-text {
+    align-self: center;
+    margin: 0;
+    padding: 6px 12px;
+    width: 100%;
+  }
+  .question-schema {
+    background-color: $hangerBackground;
+    font-family: $fontMonospace;
+    align-self: center;
+    margin: 0;
+    margin-bottom: -$nodeBorderWidth;
+    padding: 6px 12px;
+    width: 100%;
+    border-bottom: $nodeBorderWidth solid $nodeBorder;
   }
 }