diff --git a/src/app/CreateRecording/CustomRecordingForm.tsx b/src/app/CreateRecording/CustomRecordingForm.tsx
index 1863cc7f03..5427c7096a 100644
--- a/src/app/CreateRecording/CustomRecordingForm.tsx
+++ b/src/app/CreateRecording/CustomRecordingForm.tsx
@@ -509,6 +509,8 @@ export const CustomRecordingForm: React.FC = () => {
           toggleTextExpanded="Hide metadata options"
           toggleTextCollapsed="Show metadata options"
           data-quickstart-id="crf-metadata-opt"
+          toggleId='metadata-option-toggle'
+          contentId='metadata-options'
         >
           <FormGroup
             label="Labels"
@@ -548,6 +550,8 @@ export const CustomRecordingForm: React.FC = () => {
           toggleTextExpanded="Hide advanced options"
           toggleTextCollapsed="Show advanced options"
           data-quickstart-id="crf-advanced-opt"
+          toggleId='advanced-option-toggle'
+          contentId='advanced-options'
         >
           <Text component={TextVariants.small}>A value of 0 for maximum size or age means unbounded.</Text>
           <FormGroup fieldId="To Disk">
diff --git a/src/test/CreateRecording/__snapshots__/CustomRecordingForm.test.tsx.snap b/src/test/CreateRecording/__snapshots__/CustomRecordingForm.test.tsx.snap
index c887fdbc37..a464c3012e 100644
--- a/src/test/CreateRecording/__snapshots__/CustomRecordingForm.test.tsx.snap
+++ b/src/test/CreateRecording/__snapshots__/CustomRecordingForm.test.tsx.snap
@@ -1,1012 +1,1030 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<CustomRecordingForm /> renders correctly 1`] = `
-Array [
-  <small
-    className=""
-    data-ouia-component-id="OUIA-Generated-Text-1"
-    data-ouia-component-type="PF5/Text"
-    data-ouia-safe={true}
-    data-pf-content={true}
+<form
+  className="pf-v5-c-form pf-m-horizontal"
+  noValidate={true}
+>
+  <div
+    className="pf-v5-c-content"
   >
-    JDK Flight Recordings are compact records of events which have occurred within the Target JVM. Many event types are built in to the JVM itself, while others are user defined.
-  </small>,
-  <form
-    className="pf-v5-c-form pf-m-horizontal"
-    noValidate={true}
+    <p
+      className=""
+      data-ouia-component-id="OUIA-Generated-Text-1"
+      data-ouia-component-type="PF5/Text"
+      data-ouia-safe={true}
+      data-pf-content={true}
+    >
+      JDK Flight Recordings are compact records of events which have occurred within the Target JVM. Many event types are built in to the JVM itself, while others are user defined.
+    </p>
+  </div>
+  <div
+    className="pf-v5-c-form__group"
   >
     <div
-      className="pf-v5-c-form__group"
+      className="pf-v5-c-form__group-label"
     >
+      <label
+        className="pf-v5-c-form__label"
+        htmlFor="recording-name"
+      >
+        <span
+          className="pf-v5-c-form__label-text"
+        >
+          Name
+        </span>
+        <span
+          aria-hidden="true"
+          className="pf-v5-c-form__label-required"
+        >
+           
+          *
+        </span>
+      </label>
+       
+    </div>
+    <div
+      className="pf-v5-c-form__group-control"
+    >
+      <span
+        className="pf-v5-c-form-control"
+      >
+        <input
+          aria-describedby="recording-name-helper"
+          aria-invalid={false}
+          aria-label={null}
+          data-ouia-component-id="OUIA-Generated-TextInputBase-1"
+          data-ouia-component-type="PF5/TextInput"
+          data-ouia-safe={true}
+          data-quickstart-id="crf-name"
+          disabled={false}
+          id="recording-name"
+          onBlur={[Function]}
+          onChange={[Function]}
+          onFocus={[Function]}
+          required={true}
+          type="text"
+          value=""
+        />
+      </span>
       <div
-        className="pf-v5-c-form__group-label"
+        className="pf-v5-c-check"
       >
+        <input
+          aria-invalid={false}
+          aria-label="restartExisting checkbox"
+          checked={false}
+          className="pf-v5-c-check__input"
+          data-ouia-component-id="OUIA-Generated-Checkbox-1"
+          data-ouia-component-type="PF5/Checkbox"
+          data-ouia-safe={true}
+          disabled={false}
+          id="recording-restart-existing"
+          name="recording-restart-existing"
+          onChange={[Function]}
+          required={false}
+          type="checkbox"
+        />
         <label
-          className="pf-v5-c-form__label"
-          htmlFor="recording-name"
+          className="pf-v5-c-check__label"
+          htmlFor="recording-restart-existing"
         >
-          <span
-            className="pf-v5-c-form__label-text"
-          >
-            Name
-          </span>
-          <span
-            aria-hidden="true"
-            className="pf-v5-c-form__label-required"
-          >
-             
-            *
-          </span>
+          Restart if Recording already exists
         </label>
-         
       </div>
       <div
-        className="pf-v5-c-form__group-control"
+        className="pf-v5-c-form__helper-text"
       >
-        <span
-          className="pf-v5-c-form-control"
-        >
-          <input
-            aria-describedby="recording-name-helper"
-            aria-invalid={false}
-            aria-label={null}
-            data-ouia-component-id="OUIA-Generated-TextInputBase-1"
-            data-ouia-component-type="PF5/TextInput"
-            data-ouia-safe={true}
-            data-quickstart-id="crf-name"
-            disabled={false}
-            id="recording-name"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            required={true}
-            type="text"
-            value=""
-          />
-        </span>
-        <div
-          className="pf-v5-c-check"
-        >
-          <input
-            aria-invalid={false}
-            aria-label="restartExisting checkbox"
-            checked={false}
-            className="pf-v5-c-check__input"
-            data-ouia-component-id="OUIA-Generated-Checkbox-1"
-            data-ouia-component-type="PF5/Checkbox"
-            data-ouia-safe={true}
-            disabled={false}
-            id="recording-restart-existing"
-            name="recording-restart-existing"
-            onChange={[Function]}
-            required={false}
-            type="checkbox"
-          />
-          <label
-            className="pf-v5-c-check__label"
-            htmlFor="recording-restart-existing"
-          >
-            Restart if Recording already exists
-          </label>
-        </div>
         <div
-          className="pf-v5-c-form__helper-text"
+          className="pf-v5-c-helper-text"
         >
           <div
-            className="pf-v5-c-helper-text"
+            className="pf-v5-c-helper-text__item"
           >
-            <div
-              className="pf-v5-c-helper-text__item"
+            <span
+              className="pf-v5-c-helper-text__item-text"
             >
-              <span
-                className="pf-v5-c-helper-text__item-text"
-              >
-                Enter a Recording name. This will be unique within the target JVM.
-              </span>
-            </div>
+              Enter a Recording name. This will be unique within the target JVM.
+            </span>
           </div>
         </div>
       </div>
     </div>
+  </div>
+  <div
+    className="pf-v5-c-form__group"
+    data-quickstart-id="crf-duration"
+  >
     <div
-      className="pf-v5-c-form__group"
-      data-quickstart-id="crf-duration"
+      className="pf-v5-c-form__group-label"
     >
-      <div
-        className="pf-v5-c-form__group-label"
+      <label
+        className="pf-v5-c-form__label"
+        htmlFor="recording-duration"
       >
-        <label
-          className="pf-v5-c-form__label"
-          htmlFor="recording-duration"
+        <span
+          className="pf-v5-c-form__label-text"
         >
-          <span
-            className="pf-v5-c-form__label-text"
-          >
-            Duration
-          </span>
-          <span
-            aria-hidden="true"
-            className="pf-v5-c-form__label-required"
-          >
-             
-            *
-          </span>
-        </label>
-         
-      </div>
+          Duration
+        </span>
+        <span
+          aria-hidden="true"
+          className="pf-v5-c-form__label-required"
+        >
+           
+          *
+        </span>
+      </label>
+       
+    </div>
+    <div
+      className="pf-v5-c-form__group-control"
+    >
       <div
-        className="pf-v5-c-form__group-control"
+        className="pf-v5-l-split pf-m-gutter"
       >
         <div
-          className="pf-v5-l-split pf-m-gutter"
+          className="pf-v5-l-split__item"
         >
           <div
-            className="pf-v5-l-split__item"
+            className="pf-v5-c-check"
           >
-            <div
-              className="pf-v5-c-check"
+            <input
+              aria-invalid={false}
+              aria-label="Continuous checkbox"
+              checked={false}
+              className="pf-v5-c-check__input"
+              data-ouia-component-id="OUIA-Generated-Checkbox-2"
+              data-ouia-component-type="PF5/Checkbox"
+              data-ouia-safe={true}
+              disabled={false}
+              id="recording-continuous"
+              name="recording-continuous"
+              onChange={[Function]}
+              required={false}
+              type="checkbox"
+            />
+            <label
+              className="pf-v5-c-check__label"
+              htmlFor="recording-continuous"
             >
-              <input
-                aria-invalid={false}
-                aria-label="Continuous checkbox"
-                checked={false}
-                className="pf-v5-c-check__input"
-                data-ouia-component-id="OUIA-Generated-Checkbox-2"
-                data-ouia-component-type="PF5/Checkbox"
-                data-ouia-safe={true}
-                disabled={false}
-                id="recording-continuous"
-                name="recording-continuous"
-                onChange={[Function]}
-                required={false}
-                type="checkbox"
-              />
-              <label
-                className="pf-v5-c-check__label"
-                htmlFor="recording-continuous"
-              >
-                Continuous
-              </label>
-            </div>
+              Continuous
+            </label>
           </div>
+        </div>
+        <div
+          className="pf-v5-l-split__item"
+        >
           <div
-            className="pf-v5-l-split__item"
+            className="pf-v5-c-check"
           >
-            <div
-              className="pf-v5-c-check"
+            <input
+              aria-invalid={false}
+              aria-label="ArchiveOnStop checkbox"
+              checked={true}
+              className="pf-v5-c-check__input"
+              data-ouia-component-id="OUIA-Generated-Checkbox-3"
+              data-ouia-component-type="PF5/Checkbox"
+              data-ouia-safe={true}
+              disabled={false}
+              id="recording-archive-on-stop"
+              name="recording-archive-on-stop"
+              onChange={[Function]}
+              required={false}
+              type="checkbox"
+            />
+            <label
+              className="pf-v5-c-check__label"
+              htmlFor="recording-archive-on-stop"
             >
-              <input
-                aria-invalid={false}
-                aria-label="ArchiveOnStop checkbox"
-                checked={true}
-                className="pf-v5-c-check__input"
-                data-ouia-component-id="OUIA-Generated-Checkbox-3"
-                data-ouia-component-type="PF5/Checkbox"
-                data-ouia-safe={true}
-                disabled={false}
-                id="recording-archive-on-stop"
-                name="recording-archive-on-stop"
-                onChange={[Function]}
-                required={false}
-                type="checkbox"
-              />
-              <label
-                className="pf-v5-c-check__label"
-                htmlFor="recording-archive-on-stop"
-              >
-                Archive on Stop
-              </label>
-            </div>
+              Archive on Stop
+            </label>
           </div>
         </div>
+      </div>
+      <div
+        className="pf-v5-l-split pf-m-gutter"
+      >
         <div
-          className="pf-v5-l-split pf-m-gutter"
+          className="pf-v5-l-split__item pf-m-fill"
         >
-          <div
-            className="pf-v5-l-split__item pf-m-fill"
+          <span
+            className="pf-v5-c-form-control"
           >
-            <span
-              className="pf-v5-c-form-control"
-            >
-              <input
-                aria-invalid={false}
-                aria-label="Duration Picker Period Input"
-                data-ouia-component-id="OUIA-Generated-TextInputBase-2"
-                data-ouia-component-type="PF5/TextInput"
-                data-ouia-safe={true}
-                disabled={false}
-                id="duration-picker-period"
-                min="0"
-                onBlur={[Function]}
-                onChange={[Function]}
-                onFocus={[Function]}
-                required={true}
-                type="number"
-                value={30}
-              />
-            </span>
-          </div>
-          <div
-            className="pf-v5-l-split__item"
+            <input
+              aria-invalid={false}
+              aria-label="Duration Picker Period Input"
+              data-ouia-component-id="OUIA-Generated-TextInputBase-2"
+              data-ouia-component-type="PF5/TextInput"
+              data-ouia-safe={true}
+              disabled={false}
+              id="duration-picker-period"
+              min="0"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              required={true}
+              type="number"
+              value={30}
+            />
+          </span>
+        </div>
+        <div
+          className="pf-v5-l-split__item"
+        >
+          <span
+            className="pf-v5-c-form-control duration-picker__form_select"
           >
-            <span
-              className="pf-v5-c-form-control"
+            <select
+              aria-invalid={false}
+              aria-label="Duration Picker Units Input"
+              data-ouia-component-id="OUIA-Generated-FormSelect-default-1"
+              data-ouia-component-type="PF5/FormSelect"
+              data-ouia-safe={true}
+              disabled={false}
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              required={false}
+              value={1000}
             >
-              <select
-                aria-invalid={false}
-                aria-label="Duration Picker Units Input"
-                data-ouia-component-id="OUIA-Generated-FormSelect-default-1"
-                data-ouia-component-type="PF5/FormSelect"
-                data-ouia-safe={true}
+              <option
+                className=""
                 disabled={false}
-                onBlur={[Function]}
-                onChange={[Function]}
-                onFocus={[Function]}
-                required={false}
                 value={1000}
               >
-                <option
-                  className=""
-                  disabled={false}
-                  value={1000}
-                >
-                  Seconds
-                </option>
-                <option
-                  className=""
-                  disabled={false}
-                  value={60000}
-                >
-                  Minutes
-                </option>
-                <option
-                  className=""
-                  disabled={false}
-                  value={3600000}
-                >
-                  Hours
-                </option>
-              </select>
+                Seconds
+              </option>
+              <option
+                className=""
+                disabled={false}
+                value={60000}
+              >
+                Minutes
+              </option>
+              <option
+                className=""
+                disabled={false}
+                value={3600000}
+              >
+                Hours
+              </option>
+            </select>
+            <span
+              className="pf-v5-c-form-control__utilities"
+            >
               <span
-                className="pf-v5-c-form-control__utilities"
+                className="pf-v5-c-form-control__toggle-icon"
               >
-                <span
-                  className="pf-v5-c-form-control__toggle-icon"
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 320 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 320 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                    />
-                  </svg>
-                </span>
+                  <path
+                    d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                  />
+                </svg>
               </span>
             </span>
-          </div>
+          </span>
         </div>
+      </div>
+      <div
+        className="pf-v5-c-form__helper-text"
+      >
         <div
-          className="pf-v5-c-form__helper-text"
+          className="pf-v5-c-helper-text"
         >
           <div
-            className="pf-v5-c-helper-text"
+            className="pf-v5-c-helper-text__item pf-m-success"
           >
-            <div
-              className="pf-v5-c-helper-text__item pf-m-success"
+            <span
+              className="pf-v5-c-helper-text__item-text"
             >
-              <span
-                className="pf-v5-c-helper-text__item-text"
-              >
-                Time before the Recording is automatically stopped and copied to archive.
-              </span>
-            </div>
+              Time before the Recording is automatically stopped and copied to archive.
+            </span>
           </div>
         </div>
       </div>
     </div>
+  </div>
+  <div
+    className="pf-v5-c-form__group"
+  >
     <div
-      className="pf-v5-c-form__group"
+      className="pf-v5-c-form__group-label"
     >
-      <div
-        className="pf-v5-c-form__group-label"
+      <label
+        className="pf-v5-c-form__label"
+        htmlFor="recording-template"
       >
-        <label
-          className="pf-v5-c-form__label"
-          htmlFor="recording-template"
+        <span
+          className="pf-v5-c-form__label-text"
         >
-          <span
-            className="pf-v5-c-form__label-text"
-          >
-            Template
-          </span>
-          <span
-            aria-hidden="true"
-            className="pf-v5-c-form__label-required"
-          >
-             
-            *
-          </span>
-        </label>
-         
-      </div>
-      <div
-        className="pf-v5-c-form__group-control"
-      >
+          Template
+        </span>
         <span
-          className="pf-v5-c-form-control pf-m-placeholder"
+          aria-hidden="true"
+          className="pf-v5-c-form__label-required"
         >
-          <select
-            aria-invalid={false}
-            aria-label="Event Template Input"
-            data-ouia-component-id="OUIA-Generated-FormSelect-default-2"
-            data-ouia-component-type="PF5/FormSelect"
-            data-ouia-safe={true}
-            data-quickstart-id="template-selector"
-            disabled={false}
-            id="recording-template"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            required={false}
+           
+          *
+        </span>
+      </label>
+       
+    </div>
+    <div
+      className="pf-v5-c-form__group-control"
+    >
+      <span
+        className="pf-v5-c-form-control"
+      >
+        <select
+          aria-invalid={false}
+          aria-label="Event Template Input"
+          data-ouia-component-id="OUIA-Generated-FormSelect-default-2"
+          data-ouia-component-type="PF5/FormSelect"
+          data-ouia-safe={true}
+          data-quickstart-id="template-selector"
+          disabled={false}
+          id="recording-template"
+          onBlur={[Function]}
+          onChange={[Function]}
+          onFocus={[Function]}
+          required={false}
+          value=""
+        >
+          <option
+            className=""
+            disabled={true}
             value=""
+          >
+            Select a Template
+          </option>
+          <optgroup
+            className=""
+            disabled={false}
+            label="Target templates"
           >
             <option
               className=""
-              disabled={false}
+              disabled={true}
               value=""
             >
-              Select a Template
+              No templates
             </option>
-            <optgroup
-              className=""
-              disabled={false}
-              label="Target templates"
-            />
-            <optgroup
+          </optgroup>
+          <optgroup
+            className=""
+            disabled={false}
+            label="Custom Templates"
+          >
+            <option
               className=""
               disabled={false}
-              label="Custom Templates"
+              value="someEventTemplate,CUSTOM"
             >
-              <option
-                className=""
-                disabled={false}
-                value="someEventTemplate,CUSTOM"
-              >
-                someEventTemplate
-              </option>
-            </optgroup>
-          </select>
+              someEventTemplate
+            </option>
+          </optgroup>
+        </select>
+        <span
+          className="pf-v5-c-form-control__utilities"
+        >
           <span
-            className="pf-v5-c-form-control__utilities"
+            className="pf-v5-c-form-control__toggle-icon"
           >
-            <span
-              className="pf-v5-c-form-control__toggle-icon"
+            <svg
+              aria-hidden={true}
+              aria-labelledby={null}
+              className="pf-v5-svg"
+              fill="currentColor"
+              height="1em"
+              role="img"
+              viewBox="0 0 320 512"
+              width="1em"
             >
-              <svg
-                aria-hidden={true}
-                aria-labelledby={null}
-                className="pf-v5-svg"
-                fill="currentColor"
-                height="1em"
-                role="img"
-                viewBox="0 0 320 512"
-                width="1em"
-              >
-                <path
-                  d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                />
-              </svg>
-            </span>
+              <path
+                d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+              />
+            </svg>
           </span>
         </span>
+      </span>
+      <div
+        className="pf-v5-c-form__helper-text"
+      >
         <div
-          className="pf-v5-c-form__helper-text"
+          className="pf-v5-c-helper-text"
         >
           <div
-            className="pf-v5-c-helper-text"
+            className="pf-v5-c-helper-text__item"
           >
-            <div
-              className="pf-v5-c-helper-text__item"
+            <span
+              className="pf-v5-c-helper-text__item-text"
             >
-              <span
-                className="pf-v5-c-helper-text__item-text"
-              >
-                A Template must be selected
-              </span>
-            </div>
+              A Template must be selected.
+            </span>
           </div>
         </div>
       </div>
     </div>
-    <div
-      className="pf-v5-c-expandable-section"
-      data-quickstart-id="crf-metadata-opt"
+  </div>
+  <div
+    className="pf-v5-c-expandable-section"
+    data-quickstart-id="crf-metadata-opt"
+  >
+    <button
+      aria-controls="metadata-options"
+      className="pf-v5-c-expandable-section__toggle"
+      id="metadata-option-toggle"
+      onClick={[Function]}
+      type="button"
     >
-      <button
-        aria-controls="expandable-section-content-1717748449488ubkqy21mox"
-        className="pf-v5-c-expandable-section__toggle"
-        id="expandable-section-toggle-1717748449488ye8g4ku6ktg"
-        onClick={[Function]}
-        type="button"
+      <span
+        className="pf-v5-c-expandable-section__toggle-icon"
       >
-        <span
-          className="pf-v5-c-expandable-section__toggle-icon"
-        >
-          <svg
-            aria-hidden={true}
-            aria-labelledby={null}
-            className="pf-v5-svg"
-            fill="currentColor"
-            height="1em"
-            role="img"
-            viewBox="0 0 256 512"
-            width="1em"
-          >
-            <path
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            />
-          </svg>
-        </span>
-        <span
-          className="pf-v5-c-expandable-section__toggle-text"
+        <svg
+          aria-hidden={true}
+          aria-labelledby={null}
+          className="pf-v5-svg"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          viewBox="0 0 256 512"
+          width="1em"
         >
-          Show metadata options
-        </span>
-      </button>
+          <path
+            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
+          />
+        </svg>
+      </span>
+      <span
+        className="pf-v5-c-expandable-section__toggle-text"
+      >
+        Show metadata options
+      </span>
+    </button>
+    <div
+      aria-labelledby="metadata-option-toggle"
+      className="pf-v5-c-expandable-section__content"
+      hidden={true}
+      id="metadata-options"
+      role="region"
+    >
       <div
-        aria-labelledby="expandable-section-toggle-1717748449488ye8g4ku6ktg"
-        className="pf-v5-c-expandable-section__content"
-        hidden={true}
-        id="expandable-section-content-1717748449488ubkqy21mox"
-        role="region"
+        className="pf-v5-c-form__group"
       >
         <div
-          className="pf-v5-c-form__group"
+          className="pf-v5-c-form__group-label"
+        >
+          <label
+            className="pf-v5-c-form__label"
+            htmlFor="labels"
+          >
+            <span
+              className="pf-v5-c-form__label-text"
+            >
+              Labels
+            </span>
+          </label>
+           
+          <span
+            className="pf-v5-c-icon"
+          >
+            <span
+              className="pf-v5-c-icon__content"
+            >
+              <svg
+                aria-hidden={true}
+                aria-labelledby={null}
+                className="pf-v5-svg"
+                fill="currentColor"
+                height="1em"
+                role="img"
+                viewBox="0 0 1024 1024"
+                width="1em"
+              >
+                <path
+                  d="M521.3,576 C627.5,576 713.7,502 713.7,413.7 C713.7,325.4 627.6,253.6 521.3,253.6 C366,253.6 334.5,337.7 329.2,407.2 C329.2,414.3 335.2,416 343.5,416 L445,416 C450.5,416 458,415.5 460.8,406.5 C460.8,362.6 582.9,357.1 582.9,413.6 C582.9,441.9 556.2,470.9 521.3,473 C486.4,475.1 447.3,479.8 447.3,521.7 L447.3,553.8 C447.3,570.8 456.1,576 472,576 C487.9,576 521.3,576 521.3,576 M575.3,751.3 L575.3,655.3 C575.313862,651.055109 573.620137,646.982962 570.6,644 C567.638831,640.947672 563.552355,639.247987 559.3,639.29884 L463.3,639.29884 C459.055109,639.286138 454.982962,640.979863 452,644 C448.947672,646.961169 447.247987,651.047645 447.29884,655.3 L447.29884,751.3 C447.286138,755.544891 448.979863,759.617038 452,762.6 C454.961169,765.652328 459.047645,767.352013 463.3,767.30116 L559.3,767.30116 C563.544891,767.313862 567.617038,765.620137 570.6,762.6 C573.659349,759.643612 575.360354,755.553963 575.3,751.3 M512,896 C300.2,896 128,723.9 128,512 C128,300.3 300.2,128 512,128 C723.8,128 896,300.2 896,512 C896,723.8 723.7,896 512,896 M512.1,0 C229.7,0 0,229.8 0,512 C0,794.2 229.8,1024 512.1,1024 C794.4,1024 1024,794.3 1024,512 C1024,229.7 794.4,0 512.1,0"
+                />
+              </svg>
+            </span>
+          </span>
+        </div>
+        <div
+          className="pf-v5-c-form__group-control"
         >
           <div
-            className="pf-v5-c-form__group-label"
+            className="pf-v5-c-label-group pf-m-category pf-m-editable"
           >
-            <label
-              className="pf-v5-c-form__label"
-              htmlFor="labels"
+            <div
+              className="pf-v5-c-label-group__main"
             >
               <span
-                className="pf-v5-c-form__label-text"
+                aria-hidden="true"
+                className="pf-v5-c-label-group__label"
+                id="pf-random-id-4"
               >
-                Labels
+                Recording Labels
               </span>
-            </label>
-             
-            <span
-              className="pf-v5-c-icon"
-            >
-              <span
-                className="pf-v5-c-icon__content"
+              <ul
+                aria-labelledby="pf-random-id-4"
+                className="pf-v5-c-label-group__list"
+                role="list"
               >
-                <svg
-                  aria-hidden={true}
-                  aria-labelledby={null}
-                  className="pf-v5-svg"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  viewBox="0 0 1024 1024"
-                  width="1em"
+                <li
+                  className="pf-v5-c-label-group__list-item"
                 >
-                  <path
-                    d="M521.3,576 C627.5,576 713.7,502 713.7,413.7 C713.7,325.4 627.6,253.6 521.3,253.6 C366,253.6 334.5,337.7 329.2,407.2 C329.2,414.3 335.2,416 343.5,416 L445,416 C450.5,416 458,415.5 460.8,406.5 C460.8,362.6 582.9,357.1 582.9,413.6 C582.9,441.9 556.2,470.9 521.3,473 C486.4,475.1 447.3,479.8 447.3,521.7 L447.3,553.8 C447.3,570.8 456.1,576 472,576 C487.9,576 521.3,576 521.3,576 M575.3,751.3 L575.3,655.3 C575.313862,651.055109 573.620137,646.982962 570.6,644 C567.638831,640.947672 563.552355,639.247987 559.3,639.29884 L463.3,639.29884 C459.055109,639.286138 454.982962,640.979863 452,644 C448.947672,646.961169 447.247987,651.047645 447.29884,655.3 L447.29884,751.3 C447.286138,755.544891 448.979863,759.617038 452,762.6 C454.961169,765.652328 459.047645,767.352013 463.3,767.30116 L559.3,767.30116 C563.544891,767.313862 567.617038,765.620137 570.6,762.6 C573.659349,759.643612 575.360354,755.553963 575.3,751.3 M512,896 C300.2,896 128,723.9 128,512 C128,300.3 300.2,128 512,128 C723.8,128 896,300.2 896,512 C896,723.8 723.7,896 512,896 M512.1,0 C229.7,0 0,229.8 0,512 C0,794.2 229.8,1024 512.1,1024 C794.4,1024 1024,794.3 1024,512 C1024,229.7 794.4,0 512.1,0"
-                  />
-                </svg>
-              </span>
-            </span>
+                  <span
+                    className="pf-v5-c-label pf-m-blue pf-m-outline"
+                  >
+                    <button
+                      className="pf-v5-c-label__content"
+                      onClick={[Function]}
+                      type="button"
+                    >
+                      <span
+                        className="pf-v5-c-label__text"
+                      >
+                        Add label
+                      </span>
+                    </button>
+                  </span>
+                </li>
+              </ul>
+            </div>
           </div>
           <div
-            className="pf-v5-c-form__group-control"
+            className="pf-v5-c-form__helper-text"
           >
             <div
-              className="pf-v5-c-form__helper-text"
+              className="pf-v5-c-helper-text"
             >
               <div
-                className="pf-v5-c-helper-text"
+                className="pf-v5-c-helper-text__item pf-m-dynamic"
               >
-                <div
-                  className="pf-v5-c-helper-text__item pf-m-dynamic"
+                <span
+                  className="pf-v5-c-helper-text__item-text"
                 >
+                  Labels with key 
                   <span
-                    className="pf-v5-c-helper-text__item-text"
+                    className="pf-v5-c-label pf-m-compact"
                   >
-                    Labels with key 
                     <span
-                      className="pf-v5-c-label pf-m-compact"
+                      className="pf-v5-c-label__content"
                     >
                       <span
-                        className="pf-v5-c-label__content"
+                        className="pf-v5-c-label__text"
                       >
-                        <span
-                          className="pf-v5-c-label__text"
-                        >
-                          template.name
-                        </span>
+                        template.name
                       </span>
                     </span>
-                     and 
+                  </span>
+                   and 
+                  <span
+                    className="pf-v5-c-label pf-m-compact"
+                  >
                     <span
-                      className="pf-v5-c-label pf-m-compact"
+                      className="pf-v5-c-label__content"
                     >
                       <span
-                        className="pf-v5-c-label__content"
+                        className="pf-v5-c-label__text"
                       >
-                        <span
-                          className="pf-v5-c-label__text"
-                        >
-                          template.type
-                        </span>
+                        template.type
                       </span>
                     </span>
-                     are set by Cryostat and will be overwritten if specifed.
-                    <span
-                      className="pf-v5-screen-reader"
-                    >
-                      : 
-                      default status
-                      ;
-                    </span>
                   </span>
-                </div>
+                   are set by Cryostat and will be overwritten if specifed.
+                  <span
+                    className="pf-v5-screen-reader"
+                  >
+                    : 
+                    default status
+                    ;
+                  </span>
+                </span>
               </div>
             </div>
-            <button
-              aria-disabled={false}
-              aria-label="Add Label"
-              className="pf-v5-c-button pf-m-link"
-              data-ouia-component-id="OUIA-Generated-Button-link-1"
-              data-ouia-component-type="PF5/Button"
-              data-ouia-safe={true}
-              disabled={false}
-              onClick={[Function]}
-              role={null}
-              type="button"
-            >
-              <span
-                className="pf-v5-c-button__icon pf-m-start"
-              >
-                <svg
-                  aria-hidden={true}
-                  aria-labelledby={null}
-                  className="pf-v5-svg"
-                  fill="currentColor"
-                  height="1em"
-                  role="img"
-                  viewBox="0 0 512 512"
-                  width="1em"
-                >
-                  <path
-                    d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm144 276c0 6.6-5.4 12-12 12h-92v92c0 6.6-5.4 12-12 12h-56c-6.6 0-12-5.4-12-12v-92h-92c-6.6 0-12-5.4-12-12v-56c0-6.6 5.4-12 12-12h92v-92c0-6.6 5.4-12 12-12h56c6.6 0 12 5.4 12 12v92h92c6.6 0 12 5.4 12 12v56z"
-                  />
-                </svg>
-              </span>
-              Add Label
-            </button>
           </div>
         </div>
       </div>
     </div>
-    <div
-      className="pf-v5-c-expandable-section"
-      data-quickstart-id="crf-advanced-opt"
+  </div>
+  <div
+    className="pf-v5-c-expandable-section"
+    data-quickstart-id="crf-advanced-opt"
+  >
+    <button
+      aria-controls="advanced-options"
+      className="pf-v5-c-expandable-section__toggle"
+      id="advanced-option-toggle"
+      onClick={[Function]}
+      type="button"
     >
-      <button
-        aria-controls="expandable-section-content-1717748449489nsjfqirxt"
-        className="pf-v5-c-expandable-section__toggle"
-        id="expandable-section-toggle-17177484494894h5omcs1uio"
-        onClick={[Function]}
-        type="button"
+      <span
+        className="pf-v5-c-expandable-section__toggle-icon"
       >
-        <span
-          className="pf-v5-c-expandable-section__toggle-icon"
-        >
-          <svg
-            aria-hidden={true}
-            aria-labelledby={null}
-            className="pf-v5-svg"
-            fill="currentColor"
-            height="1em"
-            role="img"
-            viewBox="0 0 256 512"
-            width="1em"
-          >
-            <path
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            />
-          </svg>
-        </span>
-        <span
-          className="pf-v5-c-expandable-section__toggle-text"
+        <svg
+          aria-hidden={true}
+          aria-labelledby={null}
+          className="pf-v5-svg"
+          fill="currentColor"
+          height="1em"
+          role="img"
+          viewBox="0 0 256 512"
+          width="1em"
         >
-          Show advanced options
-        </span>
-      </button>
+          <path
+            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
+          />
+        </svg>
+      </span>
+      <span
+        className="pf-v5-c-expandable-section__toggle-text"
+      >
+        Show advanced options
+      </span>
+    </button>
+    <div
+      aria-labelledby="advanced-option-toggle"
+      className="pf-v5-c-expandable-section__content"
+      hidden={true}
+      id="advanced-options"
+      role="region"
+    >
+      <small
+        className=""
+        data-ouia-component-id="OUIA-Generated-Text-2"
+        data-ouia-component-type="PF5/Text"
+        data-ouia-safe={true}
+        data-pf-content={true}
+      >
+        A value of 0 for maximum size or age means unbounded.
+      </small>
       <div
-        aria-labelledby="expandable-section-toggle-17177484494894h5omcs1uio"
-        className="pf-v5-c-expandable-section__content"
-        hidden={true}
-        id="expandable-section-content-1717748449489nsjfqirxt"
-        role="region"
+        className="pf-v5-c-form__group"
       >
-        <small
-          className=""
-          data-ouia-component-id="OUIA-Generated-Text-2"
-          data-ouia-component-type="PF5/Text"
-          data-ouia-safe={true}
-          data-pf-content={true}
-        >
-          A value of 0 for maximum size or age means unbounded.
-        </small>
         <div
-          className="pf-v5-c-form__group"
+          className="pf-v5-c-form__group-control"
         >
           <div
-            className="pf-v5-c-form__group-control"
+            className="pf-v5-c-check"
           >
-            <div
-              className="pf-v5-c-check"
+            <input
+              aria-invalid={false}
+              checked={true}
+              className="pf-v5-c-check__input"
+              data-ouia-component-id="OUIA-Generated-Checkbox-4"
+              data-ouia-component-type="PF5/Checkbox"
+              data-ouia-safe={true}
+              disabled={false}
+              id="toDisk-checkbox"
+              onChange={[Function]}
+              required={false}
+              type="checkbox"
+            />
+            <label
+              className="pf-v5-c-check__label"
+              htmlFor="toDisk-checkbox"
             >
-              <input
-                aria-invalid={false}
-                checked={true}
-                className="pf-v5-c-check__input"
-                data-ouia-component-id="OUIA-Generated-Checkbox-4"
-                data-ouia-component-type="PF5/Checkbox"
-                data-ouia-safe={true}
-                disabled={false}
-                id="toDisk-checkbox"
-                onChange={[Function]}
-                required={false}
-                type="checkbox"
-              />
-              <label
-                className="pf-v5-c-check__label"
-                htmlFor="toDisk-checkbox"
-              >
-                To disk
-              </label>
-            </div>
+              To disk
+            </label>
+          </div>
+          <div
+            className="pf-v5-c-form__helper-text"
+          >
             <div
-              className="pf-v5-c-form__helper-text"
+              className="pf-v5-c-helper-text"
             >
               <div
-                className="pf-v5-c-helper-text"
+                className="pf-v5-c-helper-text__item"
               >
-                <div
-                  className="pf-v5-c-helper-text__item"
+                <span
+                  className="pf-v5-c-helper-text__item-text"
                 >
-                  <span
-                    className="pf-v5-c-helper-text__item-text"
-                  >
-                    Write contents of buffer onto disk. If disabled, the buffer acts as circular buffer only keeping the most recent Recording information
-                  </span>
-                </div>
+                  Write contents of buffer onto disk. If disabled, the buffer acts as circular buffer only keeping the most recent Recording information
+                </span>
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="pf-v5-c-form__group"
+      >
         <div
-          className="pf-v5-c-form__group"
+          className="pf-v5-c-form__group-label"
+        >
+          <label
+            className="pf-v5-c-form__label"
+            htmlFor="maxSize"
+          >
+            <span
+              className="pf-v5-c-form__label-text"
+            >
+              Maximum size
+            </span>
+          </label>
+           
+        </div>
+        <div
+          className="pf-v5-c-form__group-control"
         >
           <div
-            className="pf-v5-c-form__group-label"
+            className="pf-v5-l-split pf-m-gutter"
           >
-            <label
-              className="pf-v5-c-form__label"
-              htmlFor="maxSize"
+            <div
+              className="pf-v5-l-split__item pf-m-fill"
             >
               <span
-                className="pf-v5-c-form__label-text"
+                className="pf-v5-c-form-control"
               >
-                Maximum size
+                <input
+                  aria-invalid={false}
+                  aria-label="max size value"
+                  data-ouia-component-id="OUIA-Generated-TextInputBase-3"
+                  data-ouia-component-type="PF5/TextInput"
+                  data-ouia-safe={true}
+                  disabled={false}
+                  id="maxSize"
+                  min="0"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  required={true}
+                  type="number"
+                  value={0}
+                />
               </span>
-            </label>
-             
-          </div>
-          <div
-            className="pf-v5-c-form__group-control"
-          >
+            </div>
             <div
-              className="pf-v5-l-split pf-m-gutter"
+              className="pf-v5-l-split__item"
             >
-              <div
-                className="pf-v5-l-split__item pf-m-fill"
+              <span
+                className="pf-v5-c-form-control"
               >
-                <span
-                  className="pf-v5-c-form-control"
+                <select
+                  aria-invalid={false}
+                  aria-label="Max size units input"
+                  data-ouia-component-id="OUIA-Generated-FormSelect-default-3"
+                  data-ouia-component-type="PF5/FormSelect"
+                  data-ouia-safe={true}
+                  disabled={false}
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  required={false}
+                  value={1}
                 >
-                  <input
-                    aria-invalid={false}
-                    aria-label="max size value"
-                    data-ouia-component-id="OUIA-Generated-TextInputBase-3"
-                    data-ouia-component-type="PF5/TextInput"
-                    data-ouia-safe={true}
+                  <option
+                    className=""
                     disabled={false}
-                    id="maxSize"
-                    min="0"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    required={true}
-                    type="number"
-                    value={0}
-                  />
-                </span>
-              </div>
-              <div
-                className="pf-v5-l-split__item"
-              >
-                <span
-                  className="pf-v5-c-form-control"
-                >
-                  <select
-                    aria-invalid={false}
-                    aria-label="Max size units input"
-                    data-ouia-component-id="OUIA-Generated-FormSelect-default-3"
-                    data-ouia-component-type="PF5/FormSelect"
-                    data-ouia-safe={true}
+                    value="1"
+                  >
+                    B
+                  </option>
+                  <option
+                    className=""
                     disabled={false}
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    required={false}
-                    value={1}
+                    value={1024}
                   >
-                    <option
-                      className=""
-                      disabled={false}
-                      value="1"
-                    >
-                      B
-                    </option>
-                    <option
-                      className=""
-                      disabled={false}
-                      value={1024}
-                    >
-                      KiB
-                    </option>
-                    <option
-                      className=""
-                      disabled={false}
-                      value={1048576}
-                    >
-                      MiB
-                    </option>
-                  </select>
+                    KiB
+                  </option>
+                  <option
+                    className=""
+                    disabled={false}
+                    value={1048576}
+                  >
+                    MiB
+                  </option>
+                </select>
+                <span
+                  className="pf-v5-c-form-control__utilities"
+                >
                   <span
-                    className="pf-v5-c-form-control__utilities"
+                    className="pf-v5-c-form-control__toggle-icon"
                   >
-                    <span
-                      className="pf-v5-c-form-control__toggle-icon"
+                    <svg
+                      aria-hidden={true}
+                      aria-labelledby={null}
+                      className="pf-v5-svg"
+                      fill="currentColor"
+                      height="1em"
+                      role="img"
+                      viewBox="0 0 320 512"
+                      width="1em"
                     >
-                      <svg
-                        aria-hidden={true}
-                        aria-labelledby={null}
-                        className="pf-v5-svg"
-                        fill="currentColor"
-                        height="1em"
-                        role="img"
-                        viewBox="0 0 320 512"
-                        width="1em"
-                      >
-                        <path
-                          d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                        />
-                      </svg>
-                    </span>
+                      <path
+                        d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                      />
+                    </svg>
                   </span>
                 </span>
-              </div>
+              </span>
             </div>
+          </div>
+          <div
+            className="pf-v5-c-form__helper-text"
+          >
             <div
-              className="pf-v5-c-form__helper-text"
+              className="pf-v5-c-helper-text"
             >
               <div
-                className="pf-v5-c-helper-text"
+                className="pf-v5-c-helper-text__item"
               >
-                <div
-                  className="pf-v5-c-helper-text__item"
+                <span
+                  className="pf-v5-c-helper-text__item-text"
                 >
-                  <span
-                    className="pf-v5-c-helper-text__item-text"
-                  >
-                    The maximum size of Recording data saved to disk
-                  </span>
-                </div>
+                  The maximum size of Recording data saved to disk
+                </span>
               </div>
             </div>
           </div>
         </div>
+      </div>
+      <div
+        className="pf-v5-c-form__group"
+      >
         <div
-          className="pf-v5-c-form__group"
+          className="pf-v5-c-form__group-label"
+        >
+          <label
+            className="pf-v5-c-form__label"
+            htmlFor="maxAge"
+          >
+            <span
+              className="pf-v5-c-form__label-text"
+            >
+              Maximum age
+            </span>
+          </label>
+           
+        </div>
+        <div
+          className="pf-v5-c-form__group-control"
         >
           <div
-            className="pf-v5-c-form__group-label"
+            className="pf-v5-l-split pf-m-gutter"
           >
-            <label
-              className="pf-v5-c-form__label"
-              htmlFor="maxAge"
+            <div
+              className="pf-v5-l-split__item pf-m-fill"
             >
               <span
-                className="pf-v5-c-form__label-text"
+                className="pf-v5-c-form-control pf-m-disabled"
               >
-                Maximum age
+                <input
+                  aria-invalid={false}
+                  aria-label="Max age duration"
+                  data-ouia-component-id="OUIA-Generated-TextInputBase-4"
+                  data-ouia-component-type="PF5/TextInput"
+                  data-ouia-safe={true}
+                  disabled={true}
+                  id="maxAgeDuration"
+                  min="0"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  required={true}
+                  type="number"
+                  value={0}
+                />
               </span>
-            </label>
-             
-          </div>
-          <div
-            className="pf-v5-c-form__group-control"
-          >
+            </div>
             <div
-              className="pf-v5-l-split pf-m-gutter"
+              className="pf-v5-l-split__item"
             >
-              <div
-                className="pf-v5-l-split__item pf-m-fill"
+              <span
+                className="pf-v5-c-form-control pf-m-disabled recording-create__form_select"
               >
-                <span
-                  className="pf-v5-c-form-control pf-m-disabled"
+                <select
+                  aria-invalid={false}
+                  aria-label="Max Age units Input"
+                  data-ouia-component-id="OUIA-Generated-FormSelect-default-4"
+                  data-ouia-component-type="PF5/FormSelect"
+                  data-ouia-safe={true}
+                  disabled={true}
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  required={false}
+                  value={1}
                 >
-                  <input
-                    aria-invalid={false}
-                    aria-label="Max age duration"
-                    data-ouia-component-id="OUIA-Generated-TextInputBase-4"
-                    data-ouia-component-type="PF5/TextInput"
-                    data-ouia-safe={true}
-                    disabled={true}
-                    id="maxAgeDuration"
-                    min="0"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    required={true}
-                    type="number"
-                    value={0}
-                  />
-                </span>
-              </div>
-              <div
-                className="pf-v5-l-split__item"
-              >
+                  <option
+                    className=""
+                    disabled={false}
+                    value="1"
+                  >
+                    Seconds
+                  </option>
+                  <option
+                    className=""
+                    disabled={false}
+                    value={60}
+                  >
+                    Minutes
+                  </option>
+                  <option
+                    className=""
+                    disabled={false}
+                    value={3600}
+                  >
+                    Hours
+                  </option>
+                </select>
                 <span
-                  className="pf-v5-c-form-control pf-m-disabled"
+                  className="pf-v5-c-form-control__utilities"
                 >
-                  <select
-                    aria-invalid={false}
-                    aria-label="Max Age units Input"
-                    data-ouia-component-id="OUIA-Generated-FormSelect-default-4"
-                    data-ouia-component-type="PF5/FormSelect"
-                    data-ouia-safe={true}
-                    disabled={true}
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    required={false}
-                    value={1}
-                  >
-                    <option
-                      className=""
-                      disabled={false}
-                      value="1"
-                    >
-                      Seconds
-                    </option>
-                    <option
-                      className=""
-                      disabled={false}
-                      value={60}
-                    >
-                      Minutes
-                    </option>
-                    <option
-                      className=""
-                      disabled={false}
-                      value={3600}
-                    >
-                      Hours
-                    </option>
-                  </select>
                   <span
-                    className="pf-v5-c-form-control__utilities"
+                    className="pf-v5-c-form-control__toggle-icon"
                   >
-                    <span
-                      className="pf-v5-c-form-control__toggle-icon"
+                    <svg
+                      aria-hidden={true}
+                      aria-labelledby={null}
+                      className="pf-v5-svg"
+                      fill="currentColor"
+                      height="1em"
+                      role="img"
+                      viewBox="0 0 320 512"
+                      width="1em"
                     >
-                      <svg
-                        aria-hidden={true}
-                        aria-labelledby={null}
-                        className="pf-v5-svg"
-                        fill="currentColor"
-                        height="1em"
-                        role="img"
-                        viewBox="0 0 320 512"
-                        width="1em"
-                      >
-                        <path
-                          d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                        />
-                      </svg>
-                    </span>
+                      <path
+                        d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                      />
+                    </svg>
                   </span>
                 </span>
-              </div>
+              </span>
             </div>
+          </div>
+          <div
+            className="pf-v5-c-form__helper-text"
+          >
             <div
-              className="pf-v5-c-form__helper-text"
+              className="pf-v5-c-helper-text"
             >
               <div
-                className="pf-v5-c-helper-text"
+                className="pf-v5-c-helper-text__item"
               >
-                <div
-                  className="pf-v5-c-helper-text__item"
+                <span
+                  className="pf-v5-c-helper-text__item-text"
                 >
-                  <span
-                    className="pf-v5-c-helper-text__item-text"
-                  >
-                    The maximum age of Recording data stored to disk
-                  </span>
-                </div>
+                  The maximum age of Recording data stored to disk
+                </span>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
+  </div>
+  <div
+    className="pf-v5-c-form__group pf-m-action"
+  >
     <div
-      className="pf-v5-c-form__group pf-m-action"
+      className="pf-v5-c-form__group-control"
     >
       <div
-        className="pf-v5-c-form__group-control"
+        className="pf-v5-c-form__actions"
       >
-        <div
-          className="pf-v5-c-form__actions"
+        <button
+          aria-disabled={true}
+          aria-label={null}
+          className="pf-v5-c-button pf-m-primary pf-m-disabled pf-m-progress"
+          data-ouia-component-id="OUIA-Generated-Button-primary-1"
+          data-ouia-component-type="PF5/Button"
+          data-ouia-safe={true}
+          data-quickstart-id="crf-create-btn"
+          disabled={true}
+          onClick={[Function]}
+          role={null}
+          tabIndex={null}
+          type="button"
         >
-          <button
-            aria-disabled={true}
-            aria-label={null}
-            className="pf-v5-c-button pf-m-primary pf-m-disabled pf-m-progress"
-            data-ouia-component-id="OUIA-Generated-Button-primary-1"
-            data-ouia-component-type="PF5/Button"
-            data-ouia-safe={true}
-            data-quickstart-id="crf-create-btn"
-            disabled={true}
-            onClick={[Function]}
-            role={null}
-            tabIndex={null}
-            type="button"
-          >
-            Create
-          </button>
-          <button
-            aria-disabled={false}
-            aria-label={null}
-            className="pf-v5-c-button pf-m-secondary"
-            data-ouia-component-id="OUIA-Generated-Button-secondary-1"
-            data-ouia-component-type="PF5/Button"
-            data-ouia-safe={true}
-            disabled={false}
-            onClick={[Function]}
-            role={null}
-            type="button"
-          >
-            Cancel
-          </button>
-        </div>
+          Create
+        </button>
+        <button
+          aria-disabled={false}
+          aria-label={null}
+          className="pf-v5-c-button pf-m-secondary"
+          data-ouia-component-id="OUIA-Generated-Button-secondary-1"
+          data-ouia-component-type="PF5/Button"
+          data-ouia-safe={true}
+          disabled={false}
+          onClick={[Function]}
+          role={null}
+          type="button"
+        >
+          Cancel
+        </button>
       </div>
     </div>
-  </form>,
-]
+  </div>
+</form>
 `;
diff --git a/src/test/CreateRecording/__snapshots__/SnapshotRecordingForm.test.tsx.snap b/src/test/CreateRecording/__snapshots__/SnapshotRecordingForm.test.tsx.snap
index 20b7104f00..ee56698240 100644
--- a/src/test/CreateRecording/__snapshots__/SnapshotRecordingForm.test.tsx.snap
+++ b/src/test/CreateRecording/__snapshots__/SnapshotRecordingForm.test.tsx.snap
@@ -5,19 +5,23 @@ exports[`<SnapshotRecordingForm /> renders correctly 1`] = `
   className="pf-v5-c-form pf-m-horizontal"
   noValidate={true}
 >
-  <p
-    className=""
-    data-ouia-component-id="OUIA-Generated-Text-1"
-    data-ouia-component-type="PF5/Text"
-    data-ouia-safe={true}
-    data-pf-content={true}
+  <div
+    className="pf-v5-c-content"
   >
-    A Snapshot Recording is one which contains all information about all events that have been captured in the current session by 
-    <i>
-      other,  non-Snapshot
-    </i>
-     Recordings. Snapshots do not themselves define which events are enabled, their thresholds, or any other options. A Snapshot is only ever in the STOPPED state from the moment it is created.
-  </p>
+    <p
+      className=""
+      data-ouia-component-id="OUIA-Generated-Text-1"
+      data-ouia-component-type="PF5/Text"
+      data-ouia-safe={true}
+      data-pf-content={true}
+    >
+      A Snapshot Recording is one which contains all information about all events that have been captured in the current session by 
+      <i>
+        other, non-Snapshot
+      </i>
+       Recordings. Snapshots do not themselves define which events are enabled, their thresholds, or any other options. A Snapshot is only ever in the STOPPED state from the moment it is created.
+    </p>
+  </div>
   <div
     className="pf-v5-c-form__group pf-m-action"
   >