diff --git a/package.json b/package.json
index 05558619..4596c578 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openstack-uicore-foundation",
-    "version": "5.0.15-beta.2",
+    "version": "5.0.13-beta.3",
     "description": "ui reactjs components for openstack marketing site",
     "main": "lib/openstack-uicore-foundation.js",
     "scripts": {
diff --git a/src/components/index.js b/src/components/index.js
index 7c435f36..c6fc905c 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -72,7 +72,7 @@ export {default as MuiShowConfirmDialog} from './mui/showConfirmDialog'
 export {default as MuiSponsorAddonSelect} from './mui/sponsor-addon-select'
 export {default as MuiSummitAddonSelect} from './mui/summit-addon-select'
 export {default as MuiSummitsDropdown} from './mui/summits-dropdown'
-export {default as MuiFormItemTable} from './mui/FormItemTable'
+export {default as MuiFormItemTable, getCurrentApplicableRate, isItemAvailable, GlobalQuantityField, ItemTableField, UnderlyingAlertNote} from './mui/FormItemTable'
 export {default as MuiItemSettingsModal} from './mui/ItemSettingsModal'
 export {default as MuiNotesModal} from './mui/NotesModal'
 export {default as MuiSnackbarNotification} from './mui/SnackbarNotification'
diff --git a/src/components/mui/FormItemTable/__tests__/FormItemTable.test.js b/src/components/mui/FormItemTable/__tests__/FormItemTable.test.js
index 0683609b..19100866 100644
--- a/src/components/mui/FormItemTable/__tests__/FormItemTable.test.js
+++ b/src/components/mui/FormItemTable/__tests__/FormItemTable.test.js
@@ -232,6 +232,21 @@ jest.mock("../../formik-inputs/mui-formik-select", () => ({
   )
 }));
 
+jest.mock("../../formik-inputs/mui-formik-select-v2", () => ({
+  __esModule: true,
+  default: ({ name, label, options }) => (
+    <select data-testid={`select-${name}`} name={name}>
+      <option value="">{label}</option>
+      {options &&
+        options.map((opt) => (
+          <option key={opt.value} value={opt.value}>
+            {opt.label}
+          </option>
+        ))}
+    </select>
+  )
+}));
+
 jest.mock("../../formik-inputs/mui-formik-checkbox", () => ({
   __esModule: true,
   default: ({ name, label }) => (
diff --git a/src/components/mui/FormItemTable/__tests__/ItemTableField.test.js b/src/components/mui/FormItemTable/__tests__/ItemTableField.test.js
index 0eda325b..1b1c5af4 100644
--- a/src/components/mui/FormItemTable/__tests__/ItemTableField.test.js
+++ b/src/components/mui/FormItemTable/__tests__/ItemTableField.test.js
@@ -80,6 +80,14 @@ jest.mock("../../formik-inputs/mui-formik-select", () => {
   };
 });
 
+jest.mock("../../formik-inputs/mui-formik-select-v2", () => {
+  const React = require("react");
+  return {
+    __esModule: true,
+    default: ({ name }) => <div data-testid="select" data-name={name} />
+  };
+});
+
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom";
diff --git a/src/components/mui/FormItemTable/components/ItemTableField.js b/src/components/mui/FormItemTable/components/ItemTableField.js
index 2f5cdea1..69cd5f40 100644
--- a/src/components/mui/FormItemTable/components/ItemTableField.js
+++ b/src/components/mui/FormItemTable/components/ItemTableField.js
@@ -12,14 +12,13 @@
  * */
 
 import React from "react";
-import { MenuItem } from "@mui/material";
 import MuiFormikCheckbox from "../../formik-inputs/mui-formik-checkbox";
 import MuiFormikDropdownCheckbox from "../../formik-inputs/mui-formik-dropdown-checkbox";
 import MuiFormikDropdownRadio from "../../formik-inputs/mui-formik-dropdown-radio";
 import MuiFormikDatepicker from "../../formik-inputs/mui-formik-datepicker";
 import MuiFormikTimepicker from "../../formik-inputs/mui-formik-timepicker";
 import MuiFormikTextField from "../../formik-inputs/mui-formik-textfield";
-import MuiFormikSelect from "../../formik-inputs/mui-formik-select";
+import MuiFormikSelectV2 from "../../formik-inputs/mui-formik-select-v2";
 
 const ItemTableField = ({
   rowId,
@@ -33,7 +32,7 @@ const ItemTableField = ({
 
   switch (field.type) {
     case "CheckBox":
-      return <MuiFormikCheckbox {...commonProps} />;
+      return <MuiFormikCheckbox {...commonProps} size="small" />;
     case "CheckBoxList":
       return (
         <MuiFormikDropdownCheckbox
@@ -73,13 +72,11 @@ const ItemTableField = ({
       );
     case "ComboBox":
       return (
-        <MuiFormikSelect {...commonProps} size="small">
-          {field.values.map((v) => (
-            <MenuItem key={`ddopt-${v.id}`} value={v.id}>
-              {v.value}
-            </MenuItem>
-          ))}
-        </MuiFormikSelect>
+        <MuiFormikSelectV2
+          {...commonProps}
+          size="small"
+          options={field.values.map((v) => ({ value: v.id, label: v.value }))}
+        />
       );
     case "Text":
       return <MuiFormikTextField {...commonProps} fullWidth size="small" />;
diff --git a/src/components/mui/FormItemTable/index.js b/src/components/mui/FormItemTable/index.js
index e5855cfd..98f77f54 100644
--- a/src/components/mui/FormItemTable/index.js
+++ b/src/components/mui/FormItemTable/index.js
@@ -204,7 +204,10 @@ const FormItemTable = ({
                 {formatRate(row.rates.onsite)}
               </TableCell>
               {extraColumns.map((exc) => (
-                <TableCell key={`datacell-${row.form_item_id}-${exc.type_id}`}>
+                <TableCell
+                  key={`datacell-${row.form_item_id}-${exc.type_id}`}
+                  sx={{ minWidth: 200 }}
+                >
                   <ItemTableField
                     field={exc}
                     rowId={row.form_item_id}
@@ -300,3 +303,7 @@ const FormItemTable = ({
 };
 
 export default FormItemTable;
+export { getCurrentApplicableRate, isItemAvailable } from "./helpers";
+export { default as GlobalQuantityField } from "./components/GlobalQuantityField";
+export { default as ItemTableField } from "./components/ItemTableField";
+export { default as UnderlyingAlertNote } from "./components/UnderlyingAlertNote";
diff --git a/src/components/mui/ItemSettingsModal/index.js b/src/components/mui/ItemSettingsModal/index.js
index d6788f28..77ab82d5 100644
--- a/src/components/mui/ItemSettingsModal/index.js
+++ b/src/components/mui/ItemSettingsModal/index.js
@@ -14,12 +14,15 @@
 import React from "react";
 import PropTypes from "prop-types";
 import T from "i18n-react/dist/i18n-react";
+import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Dialog from "@mui/material/Dialog";
 import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogTitle from "@mui/material/DialogTitle";
-import { Divider, IconButton, Typography } from "@mui/material";
+import Divider from "@mui/material/Divider";
+import IconButton from "@mui/material/IconButton";
+import Typography from "@mui/material/Typography";
 import CloseIcon from "@mui/icons-material/Close";
 import ItemTableField from "../FormItemTable/components/ItemTableField";
 
@@ -63,14 +66,14 @@ const ItemSettingsModal = ({ item, timeZone, open, onClose }) => {
           }}
         />
         {itemFields.map((exc) => (
-          <React.Fragment key={`item-field-${exc.type_id}`}>
+          <Box key={`item-field-${exc.type_id}`} sx={{ mb: 2 }}>
             <ItemTableField
               field={exc}
               rowId={item.form_item_id}
               timeZone={timeZone}
               label={exc.name}
             />
-          </React.Fragment>
+          </Box>
         ))}
       </DialogContent>
       <DialogActions>
diff --git a/src/components/mui/formik-inputs/mui-formik-datepicker.js b/src/components/mui/formik-inputs/mui-formik-datepicker.js
index c22c2e7f..4d94ea7a 100644
--- a/src/components/mui/formik-inputs/mui-formik-datepicker.js
+++ b/src/components/mui/formik-inputs/mui-formik-datepicker.js
@@ -40,7 +40,8 @@ const MuiFormikDatepicker = ({
             error: meta.touched && Boolean(meta.error),
             helperText: meta.touched && meta.error,
             fullWidth: true,
-            disabled
+            disabled,
+            size: "small"
           },
           day: {
             sx: {
diff --git a/src/components/mui/formik-inputs/mui-formik-dropdown-checkbox.js b/src/components/mui/formik-inputs/mui-formik-dropdown-checkbox.js
index 52c5d169..bfb45cde 100644
--- a/src/components/mui/formik-inputs/mui-formik-dropdown-checkbox.js
+++ b/src/components/mui/formik-inputs/mui-formik-dropdown-checkbox.js
@@ -16,6 +16,7 @@ import {
   Checkbox,
   Divider,
   FormControl,
+  InputLabel,
   ListItemText,
   MenuItem,
   Select
@@ -23,8 +24,9 @@ import {
 import { useField } from "formik";
 import T from "i18n-react/dist/i18n-react";
 
-const MuiFormikDropdownCheckbox = ({ name, options, ...rest }) => {
+const MuiFormikDropdownCheckbox = ({ name, label, placeholder, options, ...rest }) => {
   const [field, meta, helpers] = useField(name);
+  const finalPlaceholder = placeholder || T.translate("general.select_an_option");
   const allSelected = options.every(({ value }) =>
     field.value?.includes(value)
   );
@@ -46,9 +48,16 @@ const MuiFormikDropdownCheckbox = ({ name, options, ...rest }) => {
 
   return (
     <FormControl fullWidth error={meta.touched && Boolean(meta.error)}>
+      {label && (
+        <InputLabel shrink id={`${name}-label`}>
+          {label}
+        </InputLabel>
+      )}
       <Select
         variant="outlined"
         name={name}
+        label={label}
+        labelId={`${name}-label`}
         multiple
         value={field.value || []}
         onChange={handleChange}
@@ -58,7 +67,7 @@ const MuiFormikDropdownCheckbox = ({ name, options, ...rest }) => {
         {...rest}
         renderValue={(selected) => {
           if (!selected?.length) {
-            return rest.placeholder || "";
+            return <em>{finalPlaceholder}</em>;
           }
           if (allSelected) {
             return T.translate("general.all");
diff --git a/src/components/mui/formik-inputs/mui-formik-dropdown-radio.js b/src/components/mui/formik-inputs/mui-formik-dropdown-radio.js
index 222d1eef..f983431d 100644
--- a/src/components/mui/formik-inputs/mui-formik-dropdown-radio.js
+++ b/src/components/mui/formik-inputs/mui-formik-dropdown-radio.js
@@ -14,6 +14,7 @@
 import React from "react";
 import {
   FormControl,
+  InputLabel,
   ListItemText,
   MenuItem,
   Radio,
@@ -22,7 +23,7 @@ import {
 import { useField } from "formik";
 import T from "i18n-react/dist/i18n-react";
 
-const MuiFormikDropdownRadio = ({ name, options, placeholder, ...rest }) => {
+const MuiFormikDropdownRadio = ({ name, label, options, placeholder, ...rest }) => {
   const finalPlaceholder =
     placeholder || T.translate("general.select_an_option");
   const [field, meta, helpers] = useField(name);
@@ -33,9 +34,16 @@ const MuiFormikDropdownRadio = ({ name, options, placeholder, ...rest }) => {
 
   return (
     <FormControl fullWidth error={meta.touched && Boolean(meta.error)}>
+      {label && (
+        <InputLabel shrink id={`${name}-label`}>
+          {label}
+        </InputLabel>
+      )}
       <Select
         variant="outlined"
         name={name}
+        label={label}
+        labelId={`${name}-label`}
         value={field.value || ""}
         onChange={handleChange}
         displayEmpty
diff --git a/src/components/mui/formik-inputs/mui-formik-select-v2.js b/src/components/mui/formik-inputs/mui-formik-select-v2.js
new file mode 100644
index 00000000..e17a3854
--- /dev/null
+++ b/src/components/mui/formik-inputs/mui-formik-select-v2.js
@@ -0,0 +1,58 @@
+import React from "react";
+import PropTypes from "prop-types";
+import T from "i18n-react/dist/i18n-react";
+import {
+  Select,
+  FormHelperText,
+  FormControl,
+  MenuItem,
+  InputLabel
+} from "@mui/material";
+import { useField } from "formik";
+
+const MuiFormikSelectV2 = ({ name, label, placeholder, options, ...rest }) => {
+  const [field, meta] = useField(name);
+  const finalPlaceholder =
+    placeholder || T.translate("general.select_an_option");
+
+  return (
+    <FormControl fullWidth error={meta.touched && Boolean(meta.error)}>
+      {label && <InputLabel id={`${name}-label`}>{label}</InputLabel>}
+      <Select
+        name={name}
+        label={label}
+        labelId={`${name}-label`}
+        displayEmpty
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...field}
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...rest}
+        renderValue={(selected) => {
+          if (selected == null || selected === "") {
+            return <em>{finalPlaceholder}</em>;
+          }
+          const selectedOption = options.find(
+            ({ value }) => value === selected
+          );
+          return selectedOption ? selectedOption.label : "";
+        }}
+      >
+        {options.map((op) => (
+          <MenuItem key={`selectop-${op.value}`} value={op.value}>
+            {op.label}
+          </MenuItem>
+        ))}
+      </Select>
+      {meta.touched && meta.error && (
+        <FormHelperText>{meta.error}</FormHelperText>
+      )}
+    </FormControl>
+  );
+};
+
+MuiFormikSelectV2.propTypes = {
+  name: PropTypes.string.isRequired,
+  options: PropTypes.array.isRequired
+};
+
+export default MuiFormikSelectV2;
diff --git a/src/components/mui/formik-inputs/mui-formik-timepicker.js b/src/components/mui/formik-inputs/mui-formik-timepicker.js
index 5b98355b..d25caaba 100644
--- a/src/components/mui/formik-inputs/mui-formik-timepicker.js
+++ b/src/components/mui/formik-inputs/mui-formik-timepicker.js
@@ -21,6 +21,7 @@ import { useField } from "formik";
 
 const MuiFormikTimepicker = ({
   name,
+  label,
   minTime,
   maxTime,
   timeZone,
@@ -41,6 +42,7 @@ const MuiFormikTimepicker = ({
         slotProps={{
           textField: {
             name,
+            label,
             error: meta.touched && Boolean(meta.error),
             helperText: meta.touched && meta.error,
             size: "small",