diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113d93822e..d4dc1c5759 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,55 +20,76 @@ should change the heading of the (upcoming) version to include a major version b
 ## @rjsf/antd
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` and `ArrayFieldTemplate` to adjust sizes and buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
 
-## @rjsf/antd
-
-- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
-
-## @rjsf/antd
+## @rjsf/chakra-ui
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
 
-## @rjsf/mui
+## @rjsf/core
 
-- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Added new `RichHelp` component for use in all the themes for help rendering, fixing [#4601](https://github.com/rjsf-team/react-jsonschema-form/issues/4601)
+- Updated `ArrayField` to compute and pass `displayLabel` and `hasDescription` to the rendered `ArrayFieldItemTemplate` to support fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `StringField` to extract the `title` from the props and pass it down to the widget if provided
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `AddButton` to improve it's responsiveness in relation to the `ArrayFieldItemTemplate` changes
 
-## @rjsf/shadcn
+## @rjsf/daisyui
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `WrapIfAdditionalTemplate` to add `flexGrow` and `BaseInputTemplate` to add `w-full` to allow the array item fields to grow properly
+- Updated `FieldTemplate` to render the `description` which was missing in the theme
 
-## @rjsf/primereact
+## @rjsf/fluentui-rc
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `WrapIfAdditionalTemplate` to add `flexGrow` to allow the array item fields to grow properly for non-container elements
 
-## @rjsf/react-bootstrap
+## @rjsf/mantine
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `utils.ts` to add `label` to the cleanup fields to filter it from the `uiOptions`
+- Updated `BaseInputTemplate` to display `description` which was missing in the theme
+- Updated `ArrayFieldTitleTemplate` to support the `optionalData`
 
-## @rjsf/semantic-ui
+## @rjsf/mui
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
 
-## @rjsf/daisyui
+## @rjsf/primereact
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
 
-## @rjsf/fluentui-rc
+## @rjsf/react-bootstrap
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `ArrayFieldTemplate` to improve it's responsiveness in relation to the `ArrayFieldItemTemplate` changes
 
-## @rjsf/chakra-ui
+## @rjsf/semantic-ui
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
 
-## @rjsf/mantine
+## @rjsf/shadcn
 
 - Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Updated `ArrayFieldItemTemplate` to adjust buttons location using `displayLabel` and `hasDescription`, fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated `ArrayFieldTemplate` to add `justify-end` to the `AddButton` rendering
 
 ## @rjsf/utils
 
-- Added support for rendering `ui:help` as markdown via new `ui:enableMarkdownInHelp` flag in `FieldHelpTemplate`
+- Added new `enableMarkdownInHelp` to the `GlobalUISchemaOptions` type, fixing [#4601](https://github.com/rjsf-team/react-jsonschema-form/issues/4601)
+- Added new `displayLabel` and `hasDescription` flags in the `ArrayFieldItemTemplateProps` to support fixing [#3296](https://github.com/rjsf-team/react-jsonschema-form/issues/3296)
+- Updated the three hooks to add `use client` directive to support NextJS builds
+
+## Dev / docs / playground
 
+- Updated `uiSchema.md` in the docs to document the new `enableMarkdownInHelp` flag
 
 # 6.0.2
 
diff --git a/packages/antd/src/templates/ArrayFieldItemTemplate/index.tsx b/packages/antd/src/templates/ArrayFieldItemTemplate/index.tsx
index 9cfad610ae..397cdbbb9f 100644
--- a/packages/antd/src/templates/ArrayFieldItemTemplate/index.tsx
+++ b/packages/antd/src/templates/ArrayFieldItemTemplate/index.tsx
@@ -10,6 +10,7 @@ import {
 
 const BTN_GRP_STYLE = {
   width: '100%',
+  justifyContent: 'flex-end',
 };
 
 const BTN_STYLE = {
@@ -25,21 +26,21 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, index, registry, uiSchema } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, index, registry, uiSchema } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
     registry,
     uiOptions,
   );
-  const { rowGutter = 24, toolbarAlign = 'top' } = registry.formContext;
+  const { rowGutter = 24, toolbarAlign = displayLabel ? 'middle' : 'top' } = registry.formContext;
+  const margin = hasDescription ? -8 : 16;
 
   return (
     <Row align={toolbarAlign} key={`rjsf-array-item-${index}`} gutter={rowGutter}>
       <Col flex='1'>{children}</Col>
-
       {hasToolbar && (
-        <Col flex='192px'>
+        <Col flex='120px' style={{ marginTop: displayLabel ? `${margin}px` : undefined }}>
           <Space.Compact style={BTN_GRP_STYLE}>
             <ArrayFieldItemButtonsTemplate {...buttonsProps} style={BTN_STYLE} />
           </Space.Compact>
diff --git a/packages/antd/src/templates/ArrayFieldTemplate/index.tsx b/packages/antd/src/templates/ArrayFieldTemplate/index.tsx
index ec685d6d99..494cfb6891 100644
--- a/packages/antd/src/templates/ArrayFieldTemplate/index.tsx
+++ b/packages/antd/src/templates/ArrayFieldTemplate/index.tsx
@@ -82,7 +82,7 @@ export default function ArrayFieldTemplate<
         {canAdd && (
           <Col span={24}>
             <Row gutter={rowGutter} justify='end'>
-              <Col flex='192px'>
+              <Col flex='120px'>
                 <AddButton
                   id={buttonId(fieldPathId, 'add')}
                   className='rjsf-array-item-add'
diff --git a/packages/antd/test/__snapshots__/Array.test.tsx.snap b/packages/antd/test/__snapshots__/Array.test.tsx.snap
index aa6d0464bb..9d1f5f0292 100644
--- a/packages/antd/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/antd/test/__snapshots__/Array.test.tsx.snap
@@ -45,7 +45,7 @@ exports[`array fields array 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -140,7 +140,7 @@ exports[`array fields array icons 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -191,11 +191,11 @@ exports[`array fields array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -326,7 +326,7 @@ exports[`array fields array icons 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -377,11 +377,11 @@ exports[`array fields array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -522,7 +522,7 @@ exports[`array fields array icons 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -846,7 +846,7 @@ exports[`array fields fixed array 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -897,7 +897,7 @@ exports[`array fields fixed array 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -1633,11 +1633,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -1964,11 +1964,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -2078,7 +2078,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -2173,7 +2173,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -2224,11 +2224,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -2328,7 +2328,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -2379,11 +2379,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -2493,7 +2493,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -2710,7 +2710,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -2761,7 +2761,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -3032,7 +3032,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                             style="padding-left: 12px; padding-right: 12px;"
                                           >
                                             <div
-                                              class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                              class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                               style="margin-left: -12px; margin-right: -12px;"
                                             >
                                               <div
@@ -3083,11 +3083,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                               >
                                                 <div
                                                   class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                                  style="width: 100%;"
+                                                  style="width: 100%; justify-content: flex-end;"
                                                 >
                                                   <button
                                                     class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3187,7 +3187,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                             </div>
                                             <div
-                                              class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                              class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                               style="margin-left: -12px; margin-right: -12px;"
                                             >
                                               <div
@@ -3238,11 +3238,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                               >
                                                 <div
                                                   class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                                  style="width: 100%;"
+                                                  style="width: 100%; justify-content: flex-end;"
                                                 >
                                                   <button
                                                     class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3352,7 +3352,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                             >
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                               >
                                                 <button
                                                   class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -3402,11 +3402,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3544,7 +3544,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                             style="padding-left: 12px; padding-right: 12px;"
                                           >
                                             <div
-                                              class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                              class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                               style="margin-left: -12px; margin-right: -12px;"
                                             >
                                               <div
@@ -3595,11 +3595,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                               >
                                                 <div
                                                   class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                                  style="width: 100%;"
+                                                  style="width: 100%; justify-content: flex-end;"
                                                 >
                                                   <button
                                                     class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3699,7 +3699,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                             </div>
                                             <div
-                                              class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                              class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                               style="margin-left: -12px; margin-right: -12px;"
                                             >
                                               <div
@@ -3750,11 +3750,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                               </div>
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                               >
                                                 <div
                                                   class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                                  style="width: 100%;"
+                                                  style="width: 100%; justify-content: flex-end;"
                                                 >
                                                   <button
                                                     class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3864,7 +3864,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                             >
                                               <div
                                                 class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                               >
                                                 <button
                                                   class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -3914,11 +3914,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -4028,7 +4028,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -4350,11 +4350,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -4681,11 +4681,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -4795,7 +4795,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -4890,7 +4890,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -4941,11 +4941,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -5045,7 +5045,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -5096,11 +5096,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -5210,7 +5210,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -5331,7 +5331,7 @@ exports[`with title and description array 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -5456,7 +5456,7 @@ exports[`with title and description array icons 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -5531,11 +5531,11 @@ exports[`with title and description array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -5666,7 +5666,7 @@ exports[`with title and description array icons 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -5741,11 +5741,11 @@ exports[`with title and description array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -5886,7 +5886,7 @@ exports[`with title and description array icons 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -6157,7 +6157,7 @@ exports[`with title and description fixed array 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -6232,7 +6232,7 @@ exports[`with title and description fixed array 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -6471,7 +6471,7 @@ exports[`with title and description from both array 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -6596,7 +6596,7 @@ exports[`with title and description from both array icons 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -6671,11 +6671,11 @@ exports[`with title and description from both array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -6806,7 +6806,7 @@ exports[`with title and description from both array icons 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -6881,11 +6881,11 @@ exports[`with title and description from both array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -7026,7 +7026,7 @@ exports[`with title and description from both array icons 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7297,7 +7297,7 @@ exports[`with title and description from both fixed array 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -7372,7 +7372,7 @@ exports[`with title and description from both fixed array 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -7611,7 +7611,7 @@ exports[`with title and description from uiSchema array 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7736,7 +7736,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -7811,11 +7811,11 @@ exports[`with title and description from uiSchema array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -7946,7 +7946,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -8021,11 +8021,11 @@ exports[`with title and description from uiSchema array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: -8px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -8166,7 +8166,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8437,7 +8437,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                       style="padding-left: 12px; padding-right: 12px;"
                     >
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -8512,7 +8512,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                         </div>
                       </div>
                       <div
-                        class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                        class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                         style="margin-left: -12px; margin-right: -12px;"
                       >
                         <div
@@ -8738,7 +8738,7 @@ exports[`with title and description with global label off array 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8914,11 +8914,11 @@ exports[`with title and description with global label off array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -9113,11 +9113,11 @@ exports[`with title and description with global label off array icons 1`] = `
                         </div>
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <div
                             class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                            style="width: 100%;"
+                            style="width: 100%; justify-content: flex-end;"
                           >
                             <button
                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -9258,7 +9258,7 @@ exports[`with title and description with global label off array icons 1`] = `
                       >
                         <div
                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                         >
                           <button
                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
diff --git a/packages/antd/test/__snapshots__/Form.test.tsx.snap b/packages/antd/test/__snapshots__/Form.test.tsx.snap
index c5ef1b1ece..066980f79d 100644
--- a/packages/antd/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/antd/test/__snapshots__/Form.test.tsx.snap
@@ -382,11 +382,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -656,11 +656,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -770,7 +770,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -920,7 +920,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -982,11 +982,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -1086,7 +1086,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                           </div>
                                         </div>
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -1148,11 +1148,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -1262,7 +1262,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -2837,11 +2837,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3111,11 +3111,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3225,7 +3225,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -3375,7 +3375,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -3437,11 +3437,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3541,7 +3541,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                           </div>
                                         </div>
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -3603,11 +3603,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -3717,7 +3717,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7241,7 +7241,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7350,7 +7350,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7459,7 +7459,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7577,7 +7577,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -7798,7 +7798,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8227,7 +8227,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                       >
                                                         <div
                                                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                         >
                                                           <button
                                                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8756,7 +8756,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8866,7 +8866,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -8976,7 +8976,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -9095,7 +9095,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -9322,7 +9322,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -9758,7 +9758,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                                       >
                                                         <div
                                                           class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                          style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                         >
                                                           <button
                                                             class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -10305,7 +10305,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -10522,7 +10522,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -10676,7 +10676,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -10738,11 +10738,11 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-dangerous ant-btn-color-dangerous ant-btn-variant-solid ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-remove"
@@ -10789,7 +10789,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -11010,7 +11010,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -11745,7 +11745,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -11921,7 +11921,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                                           >
                                                             <div
                                                               class="ant-col css-dev-only-do-not-override-ac2jek"
-                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                                              style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                                             >
                                                               <button
                                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -12031,7 +12031,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -12094,11 +12094,11 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-dangerous ant-btn-color-dangerous ant-btn-variant-solid ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-remove"
@@ -12146,7 +12146,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -12373,7 +12373,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -13058,7 +13058,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -13751,7 +13751,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
diff --git a/packages/antd/test/__snapshots__/Object.test.tsx.snap b/packages/antd/test/__snapshots__/Object.test.tsx.snap
index 432f3fd599..f040994b48 100644
--- a/packages/antd/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/antd/test/__snapshots__/Object.test.tsx.snap
@@ -1020,7 +1020,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -1082,11 +1082,11 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -1186,7 +1186,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                           </div>
                                         </div>
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -1248,11 +1248,11 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -1362,7 +1362,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
@@ -2317,7 +2317,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                         style="padding-left: 12px; padding-right: 12px;"
                                       >
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -2379,11 +2379,11 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -2483,7 +2483,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                           </div>
                                         </div>
                                         <div
-                                          class="ant-row ant-row-top css-dev-only-do-not-override-ac2jek"
+                                          class="ant-row ant-row-middle css-dev-only-do-not-override-ac2jek"
                                           style="margin-left: -12px; margin-right: -12px;"
                                         >
                                           <div
@@ -2545,11 +2545,11 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                           </div>
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px; margin-top: 16px;"
                                           >
                                             <div
                                               class="ant-space-compact css-dev-only-do-not-override-ac2jek"
-                                              style="width: 100%;"
+                                              style="width: 100%; justify-content: flex-end;"
                                             >
                                               <button
                                                 class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-last-item rjsf-array-item-move-up"
@@ -2659,7 +2659,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                         >
                                           <div
                                             class="ant-col css-dev-only-do-not-override-ac2jek"
-                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 192px;"
+                                            style="padding-left: 12px; padding-right: 12px; flex: 0 0 120px;"
                                           >
                                             <button
                                               class="ant-btn css-dev-only-do-not-override-ac2jek ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-icon-only ant-btn-block rjsf-array-item-add"
diff --git a/packages/chakra-ui/test/__snapshots__/Array.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Array.test.tsx.snap
index f942812a61..1bd2f5c1b0 100644
--- a/packages/chakra-ui/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Array.test.tsx.snap
@@ -9742,7 +9742,7 @@ exports[`with title and description array icons 1`] = `
                               for=":r12:"
                               id="field:::r12:::label"
                             >
-                              Test item
+                              Test field-1
                               <span
                                 aria-hidden="true"
                                 class="chakra-field__requiredIndicator emotion-15"
@@ -9942,7 +9942,7 @@ exports[`with title and description array icons 1`] = `
                               for=":r14:"
                               id="field:::r14:::label"
                             >
-                              Test item
+                              Test field-2
                               <span
                                 aria-hidden="true"
                                 class="chakra-field__requiredIndicator emotion-15"
@@ -11302,7 +11302,7 @@ exports[`with title and description fixed array 1`] = `
                               for=":rq:"
                               id="field:::rq:::label"
                             >
-                              Test item
+                              Test field-1
                               <span
                                 aria-hidden="true"
                                 class="chakra-field__requiredIndicator emotion-15"
@@ -11375,7 +11375,7 @@ exports[`with title and description fixed array 1`] = `
                               for=":rs:"
                               id="field:::rs:::label"
                             >
-                              Test item
+                              Test field-2
                               <span
                                 aria-hidden="true"
                                 class="chakra-field__requiredIndicator emotion-15"
diff --git a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
index 68e3039290..178a1e955c 100644
--- a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
@@ -1673,7 +1673,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                         for=":r8u:"
                                         id="field:::r8u:::label"
                                       >
-                                        tags-0
+                                        tags-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-15"
@@ -1827,7 +1827,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                         for=":r90:"
                                         id="field:::r90:::label"
                                       >
-                                        tags-1
+                                        tags-2
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-15"
@@ -6816,7 +6816,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                         for=":ram:"
                                         id="field:::ram:::label"
                                       >
-                                        tags-0
+                                        tags-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-15"
@@ -6970,7 +6970,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                         for=":rao:"
                                         id="field:::rao:::label"
                                       >
-                                        tags-1
+                                        tags-2
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-15"
@@ -21687,7 +21687,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         for=":r62:"
                                         id="field:::r62:::label"
                                       >
-                                        nestedArrayOptional-0
+                                        nestedArrayOptional-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-82"
@@ -23164,7 +23164,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         for=":r7v:"
                                         id="field:::r7v:::label"
                                       >
-                                        nestedArrayOptional-0
+                                        nestedArrayOptional-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-70"
diff --git a/packages/chakra-ui/test/__snapshots__/Object.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Object.test.tsx.snap
index 437b03baf9..040303a9e9 100644
--- a/packages/chakra-ui/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Object.test.tsx.snap
@@ -1953,7 +1953,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                         for=":r2v:"
                                         id="field:::r2v:::label"
                                       >
-                                        tags-0
+                                        tags-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-32"
@@ -2107,7 +2107,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                         for=":r31:"
                                         id="field:::r31:::label"
                                       >
-                                        tags-1
+                                        tags-2
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-32"
@@ -3785,7 +3785,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                         for=":r3p:"
                                         id="field:::r3p:::label"
                                       >
-                                        items-0
+                                        items-1
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-25"
@@ -3939,7 +3939,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                         for=":r3r:"
                                         id="field:::r3r:::label"
                                       >
-                                        items-1
+                                        items-2
                                         <span
                                           aria-hidden="true"
                                           class="chakra-field__requiredIndicator emotion-25"
diff --git a/packages/core/src/components/fields/ArrayField.tsx b/packages/core/src/components/fields/ArrayField.tsx
index b2aa245a0b..2f8ae37d1d 100644
--- a/packages/core/src/components/fields/ArrayField.tsx
+++ b/packages/core/src/components/fields/ArrayField.tsx
@@ -406,7 +406,9 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
     handleReorderItems,
   } = props;
   const {
+    schemaUtils,
     fields: { ArraySchemaField, SchemaField },
+    globalUiOptions,
   } = registry;
   const fieldPathId = useDeepCompareMemo<FieldPathId>(itemFieldPathId);
   const ItemSchemaField = ArraySchemaField || SchemaField;
@@ -415,6 +417,9 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
     registry,
     uiOptions,
   );
+  const displayLabel = schemaUtils.getDisplayLabel(itemSchema, itemUiSchema, globalUiOptions);
+  const { description } = getUiOptions(itemUiSchema);
+  const hasDescription = !!description || !!itemSchema.description;
   const { orderable = true, removable = true, copyable = false } = uiOptions;
   const has: { [key: string]: boolean } = {
     moveUp: orderable && canMoveUp,
@@ -510,6 +515,8 @@ function ArrayFieldItem<T = any, S extends StrictRJSFSchema = RJSFSchema, F exte
     schema: itemSchema,
     uiSchema: itemUiSchema,
     parentUiSchema,
+    displayLabel,
+    hasDescription,
   };
   return <ArrayFieldItemTemplate {...templateProps} />;
 }
diff --git a/packages/core/src/components/fields/StringField.tsx b/packages/core/src/components/fields/StringField.tsx
index 7c0e0896ff..4166f8a77b 100644
--- a/packages/core/src/components/fields/StringField.tsx
+++ b/packages/core/src/components/fields/StringField.tsx
@@ -34,8 +34,9 @@ function StringField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
     registry,
     rawErrors,
     hideError,
+    title,
   } = props;
-  const { title, format } = schema;
+  const { title: schemaTitle, format } = schema;
   const { widgets, schemaUtils, globalUiOptions } = registry;
   const enumOptions = schemaUtils.isSelect(schema) ? optionsList<T, S, F>(schema, uiSchema) : undefined;
   let defaultWidget = enumOptions ? 'select' : 'text';
@@ -44,7 +45,7 @@ function StringField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends
   }
   const { widget = defaultWidget, placeholder = '', title: uiTitle, ...options } = getUiOptions<T, S, F>(uiSchema);
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
-  const label = uiTitle ?? title ?? name;
+  const label = uiTitle ?? title ?? schemaTitle ?? name;
   const Widget = getWidget<T, S, F>(schema, widget, widgets);
   const onWidgetChange = useCallback(
     (value: T | undefined, errorSchema?: ErrorSchema, id?: string) => {
diff --git a/packages/core/src/components/templates/ArrayFieldItemTemplate.tsx b/packages/core/src/components/templates/ArrayFieldItemTemplate.tsx
index 3d25867bbd..36b4497d9b 100644
--- a/packages/core/src/components/templates/ArrayFieldItemTemplate.tsx
+++ b/packages/core/src/components/templates/ArrayFieldItemTemplate.tsx
@@ -17,7 +17,7 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, className, buttonsProps, hasToolbar, registry, uiSchema } = props;
+  const { children, className, buttonsProps, displayLabel, hasDescription, hasToolbar, registry, uiSchema } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -30,18 +30,15 @@ export default function ArrayFieldItemTemplate<
     paddingRight: 6,
     fontWeight: 'bold',
   };
+  const margin = hasDescription ? 31 : 9;
+  const containerStyle = { display: 'flex', alignItems: displayLabel ? 'center' : 'baseline' };
+  const toolbarStyle = { display: 'flex', justifyContent: 'flex-end', marginTop: displayLabel ? `${margin}px` : 0 };
   return (
-    <div className={className}>
-      <div className={hasToolbar ? 'col-xs-9' : 'col-xs-12'}>{children}</div>
+    <div className={className} style={containerStyle}>
+      <div className={hasToolbar ? 'col-xs-9 col-md-10 col-xl-11' : 'col-xs-12'}>{children}</div>
       {hasToolbar && (
-        <div className='col-xs-3 array-item-toolbox'>
-          <div
-            className='btn-group'
-            style={{
-              display: 'flex',
-              justifyContent: 'space-around',
-            }}
-          >
+        <div className='col-xs-3 col-md-2 col-xl-1 array-item-toolbox'>
+          <div className='btn-group' style={toolbarStyle}>
             <ArrayFieldItemButtonsTemplate {...buttonsProps} style={btnStyle} />
           </div>
         </div>
diff --git a/packages/core/src/components/templates/ButtonTemplates/AddButton.tsx b/packages/core/src/components/templates/ButtonTemplates/AddButton.tsx
index fcc9e62297..bdb05ef78f 100644
--- a/packages/core/src/components/templates/ButtonTemplates/AddButton.tsx
+++ b/packages/core/src/components/templates/ButtonTemplates/AddButton.tsx
@@ -14,7 +14,9 @@ export default function AddButton<T = any, S extends StrictRJSFSchema = RJSFSche
   const { translateString } = registry;
   return (
     <div className='row'>
-      <p className={`col-xs-3 col-xs-offset-9 text-right ${className}`}>
+      <p
+        className={`col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right ${className}`}
+      >
         <IconButton
           id={id}
           iconType='info'
diff --git a/packages/core/test/__snapshots__/ArraySnap.test.tsx.snap b/packages/core/test/__snapshots__/ArraySnap.test.tsx.snap
index a7cdd857c7..87e03fd5e5 100644
--- a/packages/core/test/__snapshots__/ArraySnap.test.tsx.snap
+++ b/packages/core/test/__snapshots__/ArraySnap.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`array fields array 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -64,9 +64,10 @@ exports[`array fields array icons 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -85,11 +86,11 @@ exports[`array fields array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -137,9 +138,10 @@ exports[`array fields array icons 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -158,11 +160,11 @@ exports[`array fields array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -213,7 +215,7 @@ exports[`array fields array icons 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -348,6 +350,7 @@ exports[`array fields fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -371,6 +374,7 @@ exports[`array fields fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -549,9 +553,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-object"
@@ -604,11 +609,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -646,9 +651,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-object"
@@ -701,11 +707,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -746,7 +752,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -791,9 +797,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -812,11 +819,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -854,9 +861,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -875,11 +883,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -920,7 +928,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1010,6 +1018,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -1033,6 +1042,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -1057,6 +1067,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
               class="col-xs-12"
@@ -1113,9 +1124,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-array"
@@ -1129,9 +1141,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                   >
                     <div
                       class="rjsf-array-item"
+                      style="display: flex; align-items: center;"
                     >
                       <div
-                        class="col-xs-9"
+                        class="col-xs-9 col-md-10 col-xl-11"
                       >
                         <div
                           class="form-group rjsf-field rjsf-field-string"
@@ -1150,11 +1163,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                       </div>
                       <div
-                        class="col-xs-3 array-item-toolbox"
+                        class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                       >
                         <div
                           class="btn-group"
-                          style="display: flex; justify-content: space-around;"
+                          style="display: flex; justify-content: flex-end; margin-top: 9px;"
                         >
                           <button
                             class="btn btn-default rjsf-array-item-move-up"
@@ -1192,9 +1205,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     </div>
                     <div
                       class="rjsf-array-item"
+                      style="display: flex; align-items: center;"
                     >
                       <div
-                        class="col-xs-9"
+                        class="col-xs-9 col-md-10 col-xl-11"
                       >
                         <div
                           class="form-group rjsf-field rjsf-field-string"
@@ -1213,11 +1227,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                       </div>
                       <div
-                        class="col-xs-3 array-item-toolbox"
+                        class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                       >
                         <div
                           class="btn-group"
-                          style="display: flex; justify-content: space-around;"
+                          style="display: flex; justify-content: flex-end; margin-top: 9px;"
                         >
                           <button
                             class="btn btn-default rjsf-array-item-move-up"
@@ -1258,7 +1272,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="row"
                   >
                     <p
-                      class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                      class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                     >
                       <button
                         class="btn btn-info btn-add col-xs-12"
@@ -1276,11 +1290,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1318,9 +1332,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-array"
@@ -1334,9 +1349,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                   >
                     <div
                       class="rjsf-array-item"
+                      style="display: flex; align-items: center;"
                     >
                       <div
-                        class="col-xs-9"
+                        class="col-xs-9 col-md-10 col-xl-11"
                       >
                         <div
                           class="form-group rjsf-field rjsf-field-string"
@@ -1355,11 +1371,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                       </div>
                       <div
-                        class="col-xs-3 array-item-toolbox"
+                        class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                       >
                         <div
                           class="btn-group"
-                          style="display: flex; justify-content: space-around;"
+                          style="display: flex; justify-content: flex-end; margin-top: 9px;"
                         >
                           <button
                             class="btn btn-default rjsf-array-item-move-up"
@@ -1397,9 +1413,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     </div>
                     <div
                       class="rjsf-array-item"
+                      style="display: flex; align-items: center;"
                     >
                       <div
-                        class="col-xs-9"
+                        class="col-xs-9 col-md-10 col-xl-11"
                       >
                         <div
                           class="form-group rjsf-field rjsf-field-string"
@@ -1418,11 +1435,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         </div>
                       </div>
                       <div
-                        class="col-xs-3 array-item-toolbox"
+                        class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                       >
                         <div
                           class="btn-group"
-                          style="display: flex; justify-content: space-around;"
+                          style="display: flex; justify-content: flex-end; margin-top: 9px;"
                         >
                           <button
                             class="btn btn-default rjsf-array-item-move-up"
@@ -1463,7 +1480,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="row"
                   >
                     <p
-                      class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                      class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                     >
                       <button
                         class="btn btn-info btn-add col-xs-12"
@@ -1481,11 +1498,11 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1526,7 +1543,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1571,9 +1588,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-object"
@@ -1626,11 +1644,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1668,9 +1686,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-object"
@@ -1723,11 +1742,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1768,7 +1787,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1813,9 +1832,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -1834,11 +1854,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1876,9 +1896,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -1897,11 +1918,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 9px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -1942,7 +1963,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2000,7 +2021,7 @@ exports[`with title and description array 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2056,9 +2077,10 @@ exports[`with title and description array icons 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -2084,7 +2106,7 @@ exports[`with title and description array icons 1`] = `
                   aria-describedby="root_0__error root_0__description root_0__help"
                   class="form-control"
                   id="root_0"
-                  label="Test item"
+                  label="Test field-1"
                   name="root_0"
                   placeholder=""
                   required=""
@@ -2094,11 +2116,11 @@ exports[`with title and description array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -2146,9 +2168,10 @@ exports[`with title and description array icons 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -2174,7 +2197,7 @@ exports[`with title and description array icons 1`] = `
                   aria-describedby="root_1__error root_1__description root_1__help"
                   class="form-control"
                   id="root_1"
-                  label="Test item"
+                  label="Test field-2"
                   name="root_1"
                   placeholder=""
                   required=""
@@ -2184,11 +2207,11 @@ exports[`with title and description array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -2239,7 +2262,7 @@ exports[`with title and description array icons 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2352,6 +2375,7 @@ exports[`with title and description fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -2380,7 +2404,7 @@ exports[`with title and description fixed array 1`] = `
                   aria-describedby="root_0__error root_0__description root_0__help"
                   class="form-control"
                   id="root_0"
-                  label="Test item"
+                  label="Test field-1"
                   name="root_0"
                   placeholder=""
                   required=""
@@ -2392,6 +2416,7 @@ exports[`with title and description fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -2420,7 +2445,7 @@ exports[`with title and description fixed array 1`] = `
                   aria-describedby="root_1__error root_1__description root_1__help"
                   class="form-control"
                   id="root_1"
-                  label="Test item"
+                  label="Test field-2"
                   name="root_1"
                   placeholder=""
                   required=""
@@ -2476,7 +2501,7 @@ exports[`with title and description from both array 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2532,9 +2557,10 @@ exports[`with title and description from both array icons 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -2570,11 +2596,11 @@ exports[`with title and description from both array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -2622,9 +2648,10 @@ exports[`with title and description from both array icons 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -2660,11 +2687,11 @@ exports[`with title and description from both array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -2715,7 +2742,7 @@ exports[`with title and description from both array icons 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2828,6 +2855,7 @@ exports[`with title and description from both fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -2868,6 +2896,7 @@ exports[`with title and description from both fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -2952,7 +2981,7 @@ exports[`with title and description from uiSchema array 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -3008,9 +3037,10 @@ exports[`with title and description from uiSchema array icons 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -3046,11 +3076,11 @@ exports[`with title and description from uiSchema array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -3098,9 +3128,10 @@ exports[`with title and description from uiSchema array icons 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -3136,11 +3167,11 @@ exports[`with title and description from uiSchema array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 31px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -3191,7 +3222,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -3304,6 +3335,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -3344,6 +3376,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: center;"
           >
             <div
               class="col-xs-12"
@@ -3417,7 +3450,7 @@ exports[`with title and description with global label off array 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -3462,9 +3495,10 @@ exports[`with title and description with global label off array icons 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -3473,7 +3507,7 @@ exports[`with title and description with global label off array icons 1`] = `
                   aria-describedby="root_0__error root_0__description root_0__help"
                   class="form-control"
                   id="root_0"
-                  label="Test item"
+                  label="Test field-1"
                   name="root_0"
                   placeholder=""
                   required=""
@@ -3483,11 +3517,11 @@ exports[`with title and description with global label off array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -3535,9 +3569,10 @@ exports[`with title and description with global label off array icons 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
-              class="col-xs-9"
+              class="col-xs-9 col-md-10 col-xl-11"
             >
               <div
                 class="form-group rjsf-field rjsf-field-string"
@@ -3546,7 +3581,7 @@ exports[`with title and description with global label off array icons 1`] = `
                   aria-describedby="root_1__error root_1__description root_1__help"
                   class="form-control"
                   id="root_1"
-                  label="Test item"
+                  label="Test field-2"
                   name="root_1"
                   placeholder=""
                   required=""
@@ -3556,11 +3591,11 @@ exports[`with title and description with global label off array icons 1`] = `
               </div>
             </div>
             <div
-              class="col-xs-3 array-item-toolbox"
+              class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
             >
               <div
                 class="btn-group"
-                style="display: flex; justify-content: space-around;"
+                style="display: flex; justify-content: flex-end; margin-top: 0px;"
               >
                 <button
                   class="btn btn-default rjsf-array-item-move-up"
@@ -3611,7 +3646,7 @@ exports[`with title and description with global label off array icons 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -3713,6 +3748,7 @@ exports[`with title and description with global label off fixed array 1`] = `
         >
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
               class="col-xs-12"
@@ -3724,7 +3760,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                   aria-describedby="root_0__error root_0__description root_0__help"
                   class="form-control"
                   id="root_0"
-                  label="Test item"
+                  label="Test field-1"
                   name="root_0"
                   placeholder=""
                   required=""
@@ -3736,6 +3772,7 @@ exports[`with title and description with global label off fixed array 1`] = `
           </div>
           <div
             class="rjsf-array-item"
+            style="display: flex; align-items: baseline;"
           >
             <div
               class="col-xs-12"
@@ -3747,7 +3784,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                   aria-describedby="root_1__error root_1__description root_1__help"
                   class="form-control"
                   id="root_1"
-                  label="Test item"
+                  label="Test field-2"
                   name="root_1"
                   placeholder=""
                   required=""
diff --git a/packages/core/test/__snapshots__/FormSnap.test.tsx.snap b/packages/core/test/__snapshots__/FormSnap.test.tsx.snap
index 5f96fcc130..748bbc8cfc 100644
--- a/packages/core/test/__snapshots__/FormSnap.test.tsx.snap
+++ b/packages/core/test/__snapshots__/FormSnap.test.tsx.snap
@@ -28,9 +28,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: baseline;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-object"
@@ -91,11 +92,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 0px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -133,9 +134,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: baseline;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-object"
@@ -197,11 +199,11 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 0px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -242,7 +244,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -300,9 +302,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -322,7 +325,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
                       class="form-control"
                       id="root_tags_0"
-                      label="tags-0"
+                      label="tags-1"
                       name="root[tags][0]"
                       placeholder=""
                       required=""
@@ -332,11 +335,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -374,9 +377,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -396,7 +400,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
                       class="form-control"
                       id="root_tags_1"
-                      label="tags-1"
+                      label="tags-2"
                       name="root[tags][1]"
                       placeholder=""
                       required=""
@@ -406,11 +410,11 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -451,7 +455,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -999,9 +1003,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: baseline;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-object"
@@ -1062,11 +1067,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 0px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -1104,9 +1109,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: baseline;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-object"
@@ -1168,11 +1174,11 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 0px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -1213,7 +1219,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -1271,9 +1277,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -1293,7 +1300,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
                       class="form-control"
                       id="root_tags_0"
-                      label="tags-0"
+                      label="tags-1"
                       name="root.tags.0"
                       placeholder=""
                       required=""
@@ -1303,11 +1310,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -1345,9 +1352,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -1367,7 +1375,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
                       class="form-control"
                       id="root_tags_1"
-                      label="tags-1"
+                      label="tags-2"
                       name="root.tags.1"
                       placeholder=""
                       required=""
@@ -1377,11 +1385,11 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -1422,7 +1430,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -2916,7 +2924,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -2951,7 +2959,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -2991,7 +2999,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3028,7 +3036,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -3106,7 +3114,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -3255,7 +3263,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3427,7 +3435,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3463,7 +3471,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3504,7 +3512,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3542,7 +3550,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -3622,7 +3630,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -3774,7 +3782,7 @@ exports[`single fields optional data controls does not show optional controls wh
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -3956,7 +3964,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -4028,7 +4036,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -4078,9 +4086,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -4100,7 +4109,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       aria-describedby="root_nestedArrayOptional_0__error root_nestedArrayOptional_0__description root_nestedArrayOptional_0__help"
                       class="form-control"
                       id="root_nestedArrayOptional_0"
-                      label="nestedArrayOptional-0"
+                      label="nestedArrayOptional-1"
                       name="root_nestedArrayOptional_0"
                       placeholder=""
                       required=""
@@ -4110,11 +4119,11 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-danger rjsf-array-item-remove"
@@ -4134,7 +4143,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -4212,7 +4221,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -4451,7 +4460,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -4514,7 +4523,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="row"
                 >
                   <p
-                    class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                    class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
                   >
                     <button
                       class="btn btn-info btn-add col-xs-12"
@@ -4550,9 +4559,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -4572,7 +4582,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       aria-describedby="root_nestedArrayOptional_0__error root_nestedArrayOptional_0__description root_nestedArrayOptional_0__help"
                       class="form-control"
                       id="root_nestedArrayOptional_0"
-                      label="nestedArrayOptional-0"
+                      label="nestedArrayOptional-1"
                       name="root_nestedArrayOptional_0"
                       placeholder=""
                       readonly=""
@@ -4583,11 +4593,11 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-danger rjsf-array-item-remove"
@@ -4608,7 +4618,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -4688,7 +4698,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -4921,7 +4931,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -5154,7 +5164,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
diff --git a/packages/core/test/__snapshots__/ObjectSnap.test.tsx.snap b/packages/core/test/__snapshots__/ObjectSnap.test.tsx.snap
index 279cd3dc14..d70da4dd77 100644
--- a/packages/core/test/__snapshots__/ObjectSnap.test.tsx.snap
+++ b/packages/core/test/__snapshots__/ObjectSnap.test.tsx.snap
@@ -229,7 +229,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -346,9 +346,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -368,7 +369,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                       aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
                       class="form-control"
                       id="root_tags_0"
-                      label="tags-0"
+                      label="tags-1"
                       name="root[tags][0]"
                       placeholder=""
                       required=""
@@ -378,11 +379,11 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -420,9 +421,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -442,7 +444,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                       aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
                       class="form-control"
                       id="root_tags_1"
-                      label="tags-1"
+                      label="tags-2"
                       name="root[tags][1]"
                       placeholder=""
                       required=""
@@ -452,11 +454,11 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -497,7 +499,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -793,9 +795,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
             >
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -815,7 +818,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                       aria-describedby="root_items_0__error root_items_0__description root_items_0__help"
                       class="form-control"
                       id="root_items_0"
-                      label="items-0"
+                      label="items-1"
                       name="root.items.0"
                       placeholder=""
                       required=""
@@ -825,11 +828,11 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -867,9 +870,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
               </div>
               <div
                 class="rjsf-array-item"
+                style="display: flex; align-items: center;"
               >
                 <div
-                  class="col-xs-9"
+                  class="col-xs-9 col-md-10 col-xl-11"
                 >
                   <div
                     class="form-group rjsf-field rjsf-field-string"
@@ -889,7 +893,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                       aria-describedby="root_items_1__error root_items_1__description root_items_1__help"
                       class="form-control"
                       id="root_items_1"
-                      label="items-1"
+                      label="items-2"
                       name="root.items.1"
                       placeholder=""
                       required=""
@@ -899,11 +903,11 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                   </div>
                 </div>
                 <div
-                  class="col-xs-3 array-item-toolbox"
+                  class="col-xs-3 col-md-2 col-xl-1 array-item-toolbox"
                 >
                   <div
                     class="btn-group"
-                    style="display: flex; justify-content: space-around;"
+                    style="display: flex; justify-content: flex-end; margin-top: 9px;"
                   >
                     <button
                       class="btn btn-default rjsf-array-item-move-up"
@@ -944,7 +948,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
               class="row"
             >
               <p
-                class="col-xs-3 col-xs-offset-9 text-right rjsf-array-item-add"
+                class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-array-item-add"
               >
                 <button
                   class="btn btn-info btn-add col-xs-12"
@@ -1138,7 +1142,7 @@ exports[`object fields additionalProperties 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1310,7 +1314,7 @@ exports[`object fields show add button and fields if additionalProperties is tru
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1427,7 +1431,7 @@ exports[`object fields with title and description additionalProperties 1`] = `
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1544,7 +1548,7 @@ exports[`object fields with title and description from both additionalProperties
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1750,7 +1754,7 @@ exports[`object fields with title and description from uiSchema additionalProper
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -1956,7 +1960,7 @@ exports[`object fields with title and description from uiSchema show add button
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2162,7 +2166,7 @@ exports[`object fields with title and description show add button and fields if
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2262,7 +2266,7 @@ exports[`object fields with title and description with global label off addition
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
@@ -2416,7 +2420,7 @@ exports[`object fields with title and description with global label off show add
           class="row"
         >
           <p
-            class="col-xs-3 col-xs-offset-9 text-right rjsf-object-property-expand"
+            class="col-xs-4 col-sm-2 col-lg-1 col-xs-offset-8 col-sm-offset-10 col-lg-offset-11 text-right rjsf-object-property-expand"
           >
             <button
               class="btn btn-info btn-add col-xs-12"
diff --git a/packages/daisyui/src/templates/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/daisyui/src/templates/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index d0335d269f..c4aafe09d5 100644
--- a/packages/daisyui/src/templates/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/daisyui/src/templates/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -24,7 +24,7 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, registry, uiSchema, index, totalItems } = props;
+  const { children, buttonsProps, displayLabel, hasToolbar, registry, uiSchema, index, totalItems } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -40,13 +40,14 @@ export default function ArrayFieldItemTemplate<
   const zIndex = index === undefined ? '' : 'z-' + (10 - Math.min(index, 9));
 
   return (
-    <fieldset className={`fieldset bg-base-100 border border-base-300 p-4 ${borderRadius} ${marginBottom} ${zIndex}`}>
+    <fieldset
+      className={`fieldset bg-base-100 border border-base-300 p-4 flex ${borderRadius} ${marginBottom} ${zIndex}`}
+    >
       {/* Main content area */}
       {children}
-
       {/* Action buttons */}
       {hasToolbar && (
-        <div className='flex justify-end mt-2'>
+        <div className={`flex justify-end ${displayLabel ? 'mt-5' : 'mt-1'}`}>
           <ArrayFieldItemButtonsTemplate {...buttonsProps} />
         </div>
       )}
diff --git a/packages/daisyui/src/templates/BaseInputTemplate/BaseInputTemplate.tsx b/packages/daisyui/src/templates/BaseInputTemplate/BaseInputTemplate.tsx
index c49ec3de76..884bd978fc 100644
--- a/packages/daisyui/src/templates/BaseInputTemplate/BaseInputTemplate.tsx
+++ b/packages/daisyui/src/templates/BaseInputTemplate/BaseInputTemplate.tsx
@@ -49,11 +49,11 @@ export default function BaseInputTemplate<
   } = props;
 
   const inputProps = getInputProps<T, S, F>(schema, type, options);
-  let className = 'input input-bordered';
+  let className = 'input input-bordered w-full';
   let isMulti = multiple;
   if (type === 'file') {
     isMulti = schema.type === 'array' || Boolean(options.multiple);
-    className = 'file-input w-full';
+    className = 'file-input';
   }
   // Extract step, min, max, accept from inputProps
   const { step, min, max, accept, ...rest } = inputProps;
diff --git a/packages/daisyui/src/templates/FieldTemplate/FieldTemplate.tsx b/packages/daisyui/src/templates/FieldTemplate/FieldTemplate.tsx
index 620d6ed960..b25940f398 100644
--- a/packages/daisyui/src/templates/FieldTemplate/FieldTemplate.tsx
+++ b/packages/daisyui/src/templates/FieldTemplate/FieldTemplate.tsx
@@ -87,6 +87,7 @@ export default function FieldTemplate<
           </label>
         )}
         {children}
+        {displayLabel && description ? description : null}
         {errors}
         {help}
       </div>
diff --git a/packages/daisyui/src/templates/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx b/packages/daisyui/src/templates/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
index 9c6c4c3e09..3886e5022b 100644
--- a/packages/daisyui/src/templates/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
+++ b/packages/daisyui/src/templates/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
@@ -42,7 +42,7 @@ export default function WrapIfAdditionalTemplate<
   const keyLabel = translateString(TranslatableString.KeyLabel, [label]);
 
   if (!additional) {
-    return <div className={classNames}>{children}</div>;
+    return <div className={`flex-grow ${classNames}`}>{children}</div>;
   }
 
   return (
diff --git a/packages/daisyui/test/__snapshots__/Array.test.tsx.snap b/packages/daisyui/test/__snapshots__/Array.test.tsx.snap
index cb5db328f9..eb0a73c44d 100644
--- a/packages/daisyui/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/daisyui/test/__snapshots__/Array.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`array fields array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -88,7 +88,7 @@ exports[`array fields array icons 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -103,10 +103,10 @@ exports[`array fields array icons 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -139,7 +139,7 @@ exports[`array fields array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -158,7 +158,7 @@ exports[`array fields array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -252,10 +252,10 @@ exports[`array fields array icons 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -288,7 +288,7 @@ exports[`array fields array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -307,7 +307,7 @@ exports[`array fields array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -463,7 +463,7 @@ exports[`array fields checkboxes 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -588,7 +588,7 @@ exports[`array fields empty errors array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -603,7 +603,7 @@ exports[`array fields empty errors array 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -634,7 +634,7 @@ exports[`array fields empty errors array 1`] = `
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root_name"
                       placeholder=""
@@ -681,7 +681,7 @@ exports[`array fields fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -696,10 +696,10 @@ exports[`array fields fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -732,7 +732,7 @@ exports[`array fields fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -752,10 +752,10 @@ exports[`array fields fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -788,7 +788,7 @@ exports[`array fields fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -849,7 +849,7 @@ exports[`array fields has errors 1`] = `
       </ul>
     </div>
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -864,7 +864,7 @@ exports[`array fields has errors 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string rjsf-field-error"
+                class="flex-grow rjsf-field rjsf-field-string rjsf-field-error"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string rjsf-field-error"
@@ -895,7 +895,7 @@ exports[`array fields has errors 1`] = `
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root_name"
                       placeholder=""
@@ -946,7 +946,7 @@ exports[`array fields no errors 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -961,7 +961,7 @@ exports[`array fields no errors 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -992,7 +992,7 @@ exports[`array fields no errors 1`] = `
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root_name"
                       placeholder=""
@@ -1039,7 +1039,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1054,10 +1054,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-object"
+                  class="flex-grow rjsf-field rjsf-field-object"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1072,7 +1072,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1103,7 +1103,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_0_name__error root_0_name__description root_0_name__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_0_name"
                                   name="root[0][name]"
                                   placeholder=""
@@ -1125,7 +1125,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-number"
+                            class="flex-grow rjsf-field rjsf-field-number"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -1156,7 +1156,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_0_value__error root_0_value__description root_0_value__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_0_value"
                                   name="root[0][value]"
                                   placeholder=""
@@ -1187,7 +1187,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -1260,10 +1260,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-object"
+                  class="flex-grow rjsf-field rjsf-field-object"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1278,7 +1278,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1309,7 +1309,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_1_name__error root_1_name__description root_1_name__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_1_name"
                                   name="root[1][name]"
                                   placeholder=""
@@ -1331,7 +1331,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-number"
+                            class="flex-grow rjsf-field rjsf-field-number"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -1362,7 +1362,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_1_value__error root_1_value__description root_1_value__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_1_value"
                                   name="root[1][value]"
                                   placeholder=""
@@ -1393,7 +1393,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -1528,7 +1528,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1543,10 +1543,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1579,7 +1579,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root[0]"
                         placeholder=""
@@ -1598,7 +1598,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -1671,10 +1671,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1707,7 +1707,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root[1]"
                         placeholder=""
@@ -1726,7 +1726,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -1861,7 +1861,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes with nameGenerator 1`] =
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1986,7 +1986,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2001,10 +2001,10 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2037,7 +2037,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root[0]"
                         placeholder=""
@@ -2057,10 +2057,10 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4  mb-[-1px] z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex  mb-[-1px] z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -2093,7 +2093,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root[1]"
                         placeholder=""
@@ -2114,10 +2114,10 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-8"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-8"
               >
                 <div
-                  class="rjsf-field rjsf-field-boolean"
+                  class="flex-grow rjsf-field rjsf-field-boolean"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -2174,7 +2174,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2189,10 +2189,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-array"
+                  class="flex-grow rjsf-field rjsf-field-array"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2207,10 +2207,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                           class="rjsf-array-item-list"
                         >
                           <fieldset
-                            class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                            class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="flex-grow rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2243,7 +2243,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   </label>
                                   <input
                                     aria-describedby="root_0_0__error root_0_0__description root_0_0__help"
-                                    class="input input-bordered"
+                                    class="input input-bordered w-full"
                                     id="root_0_0"
                                     name="root[0][0]"
                                     placeholder=""
@@ -2262,7 +2262,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                               </div>
                             </div>
                             <div
-                              class="flex justify-end mt-2"
+                              class="flex justify-end mt-5"
                             >
                               <div
                                 class="join"
@@ -2335,10 +2335,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                             </div>
                           </fieldset>
                           <fieldset
-                            class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                            class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="flex-grow rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2371,7 +2371,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   </label>
                                   <input
                                     aria-describedby="root_0_1__error root_0_1__description root_0_1__help"
-                                    class="input input-bordered"
+                                    class="input input-bordered w-full"
                                     id="root_0_1"
                                     name="root[0][1]"
                                     placeholder=""
@@ -2390,7 +2390,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                               </div>
                             </div>
                             <div
-                              class="flex justify-end mt-2"
+                              class="flex justify-end mt-5"
                             >
                               <div
                                 class="join"
@@ -2508,7 +2508,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -2581,10 +2581,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-array"
+                  class="flex-grow rjsf-field rjsf-field-array"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2599,10 +2599,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                           class="rjsf-array-item-list"
                         >
                           <fieldset
-                            class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                            class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="flex-grow rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2635,7 +2635,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   </label>
                                   <input
                                     aria-describedby="root_1_0__error root_1_0__description root_1_0__help"
-                                    class="input input-bordered"
+                                    class="input input-bordered w-full"
                                     id="root_1_0"
                                     name="root[1][0]"
                                     placeholder=""
@@ -2654,7 +2654,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                               </div>
                             </div>
                             <div
-                              class="flex justify-end mt-2"
+                              class="flex justify-end mt-5"
                             >
                               <div
                                 class="join"
@@ -2727,10 +2727,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                             </div>
                           </fieldset>
                           <fieldset
-                            class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                            class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="flex-grow rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2763,7 +2763,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   </label>
                                   <input
                                     aria-describedby="root_1_1__error root_1_1__description root_1_1__help"
-                                    class="input input-bordered"
+                                    class="input input-bordered w-full"
                                     id="root_1_1"
                                     name="root[1][1]"
                                     placeholder=""
@@ -2782,7 +2782,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                               </div>
                             </div>
                             <div
-                              class="flex justify-end mt-2"
+                              class="flex justify-end mt-5"
                             >
                               <div
                                 class="join"
@@ -2900,7 +2900,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -3035,7 +3035,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3050,10 +3050,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-object"
+                  class="flex-grow rjsf-field rjsf-field-object"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3068,7 +3068,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3099,7 +3099,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_0_name__error root_0_name__description root_0_name__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_0_name"
                                   name="root.0.name"
                                   placeholder=""
@@ -3121,7 +3121,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-number"
+                            class="flex-grow rjsf-field rjsf-field-number"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -3152,7 +3152,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_0_value__error root_0_value__description root_0_value__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_0_value"
                                   name="root.0.value"
                                   placeholder=""
@@ -3183,7 +3183,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -3256,10 +3256,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-object"
+                  class="flex-grow rjsf-field rjsf-field-object"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3274,7 +3274,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3305,7 +3305,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_1_name__error root_1_name__description root_1_name__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_1_name"
                                   name="root.1.name"
                                   placeholder=""
@@ -3327,7 +3327,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                           class=""
                         >
                           <div
-                            class="rjsf-field rjsf-field-number"
+                            class="flex-grow rjsf-field rjsf-field-number"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -3358,7 +3358,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </label>
                                 <input
                                   aria-describedby="root_1_value__error root_1_value__description root_1_value__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_1_value"
                                   name="root.1.value"
                                   placeholder=""
@@ -3389,7 +3389,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -3524,7 +3524,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3539,10 +3539,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3575,7 +3575,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root.0"
                         placeholder=""
@@ -3594,7 +3594,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -3667,10 +3667,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3703,7 +3703,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root.1"
                         placeholder=""
@@ -3722,7 +3722,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -3857,7 +3857,7 @@ exports[`with title and description array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3962,7 +3962,7 @@ exports[`with title and description array icons 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4000,10 +4000,10 @@ exports[`with title and description array icons 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4034,12 +4034,12 @@ exports[`with title and description array icons 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-1
                         </span>
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -4048,6 +4048,16 @@ exports[`with title and description array icons 1`] = `
                         value="a"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a test item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -4058,7 +4068,7 @@ exports[`with title and description array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -4152,10 +4162,10 @@ exports[`with title and description array icons 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4186,12 +4196,12 @@ exports[`with title and description array icons 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-2
                         </span>
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -4200,6 +4210,16 @@ exports[`with title and description array icons 1`] = `
                         value="b"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a test item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -4210,7 +4230,7 @@ exports[`with title and description array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -4366,7 +4386,7 @@ exports[`with title and description checkboxes 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4466,6 +4486,16 @@ exports[`with title and description checkboxes 1`] = `
             </ul>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            a test description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -4493,7 +4523,7 @@ exports[`with title and description fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4531,10 +4561,10 @@ exports[`with title and description fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4565,12 +4595,12 @@ exports[`with title and description fixed array 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-1
                         </span>
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -4579,6 +4609,16 @@ exports[`with title and description fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a test item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -4590,10 +4630,10 @@ exports[`with title and description fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -4624,12 +4664,12 @@ exports[`with title and description fixed array 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-2
                         </span>
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -4639,6 +4679,16 @@ exports[`with title and description fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a test item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -4679,7 +4729,7 @@ exports[`with title and description from both array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4784,7 +4834,7 @@ exports[`with title and description from both array icons 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4822,10 +4872,10 @@ exports[`with title and description from both array icons 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4861,7 +4911,7 @@ exports[`with title and description from both array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -4870,6 +4920,16 @@ exports[`with title and description from both array icons 1`] = `
                         value="a"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -4880,7 +4940,7 @@ exports[`with title and description from both array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -4974,10 +5034,10 @@ exports[`with title and description from both array icons 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5013,7 +5073,7 @@ exports[`with title and description from both array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -5022,6 +5082,16 @@ exports[`with title and description from both array icons 1`] = `
                         value="b"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -5032,7 +5102,7 @@ exports[`with title and description from both array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -5188,7 +5258,7 @@ exports[`with title and description from both checkboxes 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5288,6 +5358,16 @@ exports[`with title and description from both checkboxes 1`] = `
             </ul>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            a fancier description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -5315,7 +5395,7 @@ exports[`with title and description from both fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5353,10 +5433,10 @@ exports[`with title and description from both fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5392,7 +5472,7 @@ exports[`with title and description from both fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -5401,6 +5481,16 @@ exports[`with title and description from both fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -5412,10 +5502,10 @@ exports[`with title and description from both fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -5451,7 +5541,7 @@ exports[`with title and description from both fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -5461,6 +5551,16 @@ exports[`with title and description from both fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -5501,7 +5601,7 @@ exports[`with title and description from uiSchema array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5606,7 +5706,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5644,10 +5744,10 @@ exports[`with title and description from uiSchema array icons 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5683,7 +5783,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -5692,6 +5792,16 @@ exports[`with title and description from uiSchema array icons 1`] = `
                         value="a"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -5702,7 +5812,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -5796,10 +5906,10 @@ exports[`with title and description from uiSchema array icons 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5835,7 +5945,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -5844,6 +5954,16 @@ exports[`with title and description from uiSchema array icons 1`] = `
                         value="b"
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -5854,7 +5974,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-5"
                 >
                   <div
                     class="join"
@@ -6010,7 +6130,7 @@ exports[`with title and description from uiSchema checkboxes 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6110,6 +6230,16 @@ exports[`with title and description from uiSchema checkboxes 1`] = `
             </ul>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            a fancier description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -6137,7 +6267,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6175,10 +6305,10 @@ exports[`with title and description from uiSchema fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6214,7 +6344,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -6223,6 +6353,16 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_0__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -6234,10 +6374,10 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -6273,7 +6413,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -6283,6 +6423,16 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                         value=""
                       />
                     </div>
+                    <div
+                      class="description-field my-4"
+                      id="root_1__description"
+                    >
+                      <div
+                        class="text-sm text-base-content/80"
+                      >
+                        a fancier item description
+                      </div>
+                    </div>
                     <div
                       class="rjsf-field-error-template text-red-600"
                     >
@@ -6323,7 +6473,7 @@ exports[`with title and description with global label off array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6405,7 +6555,7 @@ exports[`with title and description with global label off array icons 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6420,10 +6570,10 @@ exports[`with title and description with global label off array icons 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6439,12 +6589,12 @@ exports[`with title and description with global label off array icons 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-1
                         </span>
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -6463,7 +6613,7 @@ exports[`with title and description with global label off array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -6557,10 +6707,10 @@ exports[`with title and description with global label off array icons 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6576,12 +6726,12 @@ exports[`with title and description with global label off array icons 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-2
                         </span>
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
@@ -6600,7 +6750,7 @@ exports[`with title and description with global label off array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="flex justify-end mt-2"
+                  class="flex justify-end mt-1"
                 >
                   <div
                     class="join"
@@ -6756,7 +6906,7 @@ exports[`with title and description with global label off checkboxes 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6856,6 +7006,16 @@ exports[`with title and description with global label off checkboxes 1`] = `
             </ul>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            a test description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -6883,7 +7043,7 @@ exports[`with title and description with global label off fixed array 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6898,10 +7058,10 @@ exports[`with title and description with global label off fixed array 1`] = `
               class="rjsf-array-item-list"
             >
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
               >
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="flex-grow rjsf-field rjsf-field-string"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6917,12 +7077,12 @@ exports[`with title and description with global label off fixed array 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-1
                         </span>
                       </label>
                       <input
                         aria-describedby="root_0__error root_0__description root_0__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_0"
                         name="root_0"
                         placeholder=""
@@ -6942,10 +7102,10 @@ exports[`with title and description with global label off fixed array 1`] = `
                 </div>
               </fieldset>
               <fieldset
-                class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
               >
                 <div
-                  class="rjsf-field rjsf-field-number"
+                  class="flex-grow rjsf-field rjsf-field-number"
                 >
                   <div
                     class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -6961,12 +7121,12 @@ exports[`with title and description with global label off fixed array 1`] = `
                         <span
                           class="label-text"
                         >
-                          Test item
+                          Test field-2
                         </span>
                       </label>
                       <input
                         aria-describedby="root_1__error root_1__description root_1__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_1"
                         name="root_1"
                         placeholder=""
diff --git a/packages/daisyui/test/__snapshots__/Form.test.tsx.snap b/packages/daisyui/test/__snapshots__/Form.test.tsx.snap
index db2bf11f4e..7d8b3ed3cc 100644
--- a/packages/daisyui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/daisyui/test/__snapshots__/Form.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -21,7 +21,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
               class="mt-2"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -49,10 +49,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-object"
+                            class="flex-grow rjsf-field rjsf-field-object"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -80,7 +80,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-string"
+                                      class="flex-grow rjsf-field rjsf-field-string"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -111,7 +111,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                           </label>
                                           <input
                                             aria-describedby="root_tasks_0_title__error root_tasks_0_title__description root_tasks_0_title__help"
-                                            class="input input-bordered"
+                                            class="input input-bordered w-full"
                                             id="root_tasks_0_title"
                                             name="root[tasks][0][title]"
                                             placeholder=""
@@ -133,7 +133,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-boolean"
+                                      class="flex-grow rjsf-field rjsf-field-boolean"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -183,7 +183,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-1"
                           >
                             <div
                               class="join"
@@ -256,10 +256,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-object"
+                            class="flex-grow rjsf-field rjsf-field-object"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -287,7 +287,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-string"
+                                      class="flex-grow rjsf-field rjsf-field-string"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -318,7 +318,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                           </label>
                                           <input
                                             aria-describedby="root_tasks_1_title__error root_tasks_1_title__description root_tasks_1_title__help"
-                                            class="input input-bordered"
+                                            class="input input-bordered w-full"
                                             id="root_tasks_1_title"
                                             name="root[tasks][1][title]"
                                             placeholder=""
@@ -340,7 +340,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-boolean"
+                                      class="flex-grow rjsf-field rjsf-field-boolean"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -391,7 +391,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-1"
                           >
                             <div
                               class="join"
@@ -538,7 +538,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -553,7 +553,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -581,10 +581,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -615,12 +615,12 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-0
+                                    tags-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_0"
                                   name="root[tags][0]"
                                   placeholder=""
@@ -639,7 +639,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -712,10 +712,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -746,12 +746,12 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-1
+                                    tags-2
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_1"
                                   name="root[tags][1]"
                                   placeholder=""
@@ -770,7 +770,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -917,7 +917,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -932,7 +932,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes field 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1042,7 +1042,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1057,7 +1057,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1085,7 +1085,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1116,7 +1116,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_firstName__error root_person_firstName__description root_person_firstName__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_firstName"
                                 name="root[person][firstName]"
                                 placeholder=""
@@ -1138,7 +1138,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1169,7 +1169,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_lastName__error root_person_lastName__description root_person_lastName__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_lastName"
                                 name="root[person][lastName]"
                                 placeholder=""
@@ -1191,7 +1191,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1219,7 +1219,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1250,7 +1250,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_street__error root_person_address_street__description root_person_address_street__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_street"
                                           name="root[person][address][street]"
                                           placeholder=""
@@ -1272,7 +1272,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1303,7 +1303,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_city"
                                           name="root[person][address][city]"
                                           placeholder=""
@@ -1374,7 +1374,7 @@ exports[`nameGenerator bracketNameGenerator radio field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1389,7 +1389,7 @@ exports[`nameGenerator bracketNameGenerator radio field 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1485,7 +1485,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1500,7 +1500,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1622,7 +1622,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1637,7 +1637,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1668,7 +1668,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
                     </label>
                     <input
                       aria-describedby="root_firstName__error root_firstName__description root_firstName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_firstName"
                       name="root[firstName]"
                       placeholder=""
@@ -1690,7 +1690,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -1721,7 +1721,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
                     </label>
                     <input
                       aria-describedby="root_age__error root_age__description root_age__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_age"
                       name="root[age]"
                       placeholder=""
@@ -1744,7 +1744,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-boolean"
+                class="flex-grow rjsf-field rjsf-field-boolean"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -1811,7 +1811,7 @@ exports[`nameGenerator bracketNameGenerator textarea field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1826,7 +1826,7 @@ exports[`nameGenerator bracketNameGenerator textarea field 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1890,7 +1890,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1905,7 +1905,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
               class="mt-2"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1933,10 +1933,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-object"
+                            class="flex-grow rjsf-field rjsf-field-object"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1964,7 +1964,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-string"
+                                      class="flex-grow rjsf-field rjsf-field-string"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1995,7 +1995,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                           </label>
                                           <input
                                             aria-describedby="root_tasks_0_title__error root_tasks_0_title__description root_tasks_0_title__help"
-                                            class="input input-bordered"
+                                            class="input input-bordered w-full"
                                             id="root_tasks_0_title"
                                             name="root.tasks.0.title"
                                             placeholder=""
@@ -2017,7 +2017,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-boolean"
+                                      class="flex-grow rjsf-field rjsf-field-boolean"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -2067,7 +2067,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-1"
                           >
                             <div
                               class="join"
@@ -2140,10 +2140,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-object"
+                            class="flex-grow rjsf-field rjsf-field-object"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2171,7 +2171,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-string"
+                                      class="flex-grow rjsf-field rjsf-field-string"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2202,7 +2202,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                           </label>
                                           <input
                                             aria-describedby="root_tasks_1_title__error root_tasks_1_title__description root_tasks_1_title__help"
-                                            class="input input-bordered"
+                                            class="input input-bordered w-full"
                                             id="root_tasks_1_title"
                                             name="root.tasks.1.title"
                                             placeholder=""
@@ -2224,7 +2224,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                     class=""
                                   >
                                     <div
-                                      class="rjsf-field rjsf-field-boolean"
+                                      class="flex-grow rjsf-field rjsf-field-boolean"
                                     >
                                       <div
                                         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -2275,7 +2275,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-1"
                           >
                             <div
                               class="join"
@@ -2422,7 +2422,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2437,7 +2437,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2465,10 +2465,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2499,12 +2499,12 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-0
+                                    tags-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_0"
                                   name="root.tags.0"
                                   placeholder=""
@@ -2523,7 +2523,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -2596,10 +2596,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2630,12 +2630,12 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-1
+                                    tags-2
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_1"
                                   name="root.tags.1"
                                   placeholder=""
@@ -2654,7 +2654,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -2801,7 +2801,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2816,7 +2816,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2844,7 +2844,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2875,7 +2875,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_firstName__error root_person_firstName__description root_person_firstName__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_firstName"
                                 name="root.person.firstName"
                                 placeholder=""
@@ -2897,7 +2897,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2928,7 +2928,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_lastName__error root_person_lastName__description root_person_lastName__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_lastName"
                                 name="root.person.lastName"
                                 placeholder=""
@@ -2950,7 +2950,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2978,7 +2978,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3009,7 +3009,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_street__error root_person_address_street__description root_person_address_street__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_street"
                                           name="root.person.address.street"
                                           placeholder=""
@@ -3031,7 +3031,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3062,7 +3062,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_city"
                                           name="root.person.address.city"
                                           placeholder=""
@@ -3133,7 +3133,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3148,7 +3148,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3270,7 +3270,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3285,7 +3285,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3316,7 +3316,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
                     </label>
                     <input
                       aria-describedby="root_firstName__error root_firstName__description root_firstName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_firstName"
                       name="root.firstName"
                       placeholder=""
@@ -3338,7 +3338,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -3369,7 +3369,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
                     </label>
                     <input
                       aria-describedby="root_age__error root_age__description root_age__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_age"
                       name="root.age"
                       placeholder=""
@@ -3392,7 +3392,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-boolean"
+                class="flex-grow rjsf-field rjsf-field-boolean"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3459,7 +3459,7 @@ exports[`single fields checkbox field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3501,7 +3501,7 @@ exports[`single fields checkbox field with description in schema and FieldTempla
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3539,6 +3539,16 @@ exports[`single fields checkbox field with description in schema and FieldTempla
             </span>
           </label>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            This is a checkbox description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -3566,7 +3576,7 @@ exports[`single fields checkbox field with label 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3621,7 +3631,7 @@ exports[`single fields checkbox field with label and description 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3686,7 +3696,7 @@ exports[`single fields checkbox field with label and rich text description 1`] =
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -3759,7 +3769,7 @@ exports[`single fields checkboxes field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3873,7 +3883,7 @@ exports[`single fields checkboxes widget with custom options and labels 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3945,6 +3955,16 @@ exports[`single fields checkboxes widget with custom options and labels 1`] = `
             </label>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            A group of checkboxes
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -3978,7 +3998,7 @@ exports[`single fields checkboxes widget with required field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -4049,6 +4069,16 @@ exports[`single fields checkboxes widget with required field 1`] = `
             </label>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            At least one option must be selected
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -4076,7 +4106,7 @@ exports[`single fields field with description 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4091,7 +4121,7 @@ exports[`single fields field with description 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4122,7 +4152,7 @@ exports[`single fields field with description 1`] = `
                     </label>
                     <input
                       aria-describedby="root_my-field__error root_my-field__description root_my-field__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_my-field"
                       name="root_my-field"
                       placeholder=""
@@ -4130,6 +4160,16 @@ exports[`single fields field with description 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_my-field__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      some description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -4169,7 +4209,7 @@ exports[`single fields field with description in uiSchema 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4184,7 +4224,7 @@ exports[`single fields field with description in uiSchema 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4215,7 +4255,7 @@ exports[`single fields field with description in uiSchema 1`] = `
                     </label>
                     <input
                       aria-describedby="root_my-field__error root_my-field__description root_my-field__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_my-field"
                       name="root_my-field"
                       placeholder=""
@@ -4223,6 +4263,16 @@ exports[`single fields field with description in uiSchema 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_my-field__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      some other description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -4262,7 +4312,7 @@ exports[`single fields field with markdown description 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4277,7 +4327,7 @@ exports[`single fields field with markdown description 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4308,7 +4358,7 @@ exports[`single fields field with markdown description 1`] = `
                     </label>
                     <input
                       aria-describedby="root_my-field__error root_my-field__description root_my-field__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_my-field"
                       name="root_my-field"
                       placeholder=""
@@ -4316,6 +4366,22 @@ exports[`single fields field with markdown description 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_my-field__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      <span>
+                        some 
+                        <strong>
+                          Rich
+                        </strong>
+                         description
+                      </span>
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -4355,7 +4421,7 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4370,7 +4436,7 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4401,7 +4467,7 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
                     </label>
                     <input
                       aria-describedby="root_my-field__error root_my-field__description root_my-field__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_my-field"
                       name="root_my-field"
                       placeholder=""
@@ -4409,6 +4475,18 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_my-field__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      <span>
+                        some other description
+                      </span>
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -4448,7 +4526,7 @@ exports[`single fields format color 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4475,7 +4553,7 @@ exports[`single fields format color 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -4510,7 +4588,7 @@ exports[`single fields format date 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4584,7 +4662,7 @@ exports[`single fields format datetime 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4658,7 +4736,7 @@ exports[`single fields format time 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4719,7 +4797,7 @@ exports[`single fields help and error display 1`] = `
       </ul>
     </div>
     <div
-      class="rjsf-field rjsf-field-string rjsf-field-error"
+      class="flex-grow rjsf-field rjsf-field-string rjsf-field-error"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string rjsf-field-error"
@@ -4746,7 +4824,7 @@ exports[`single fields help and error display 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -4791,7 +4869,7 @@ exports[`single fields hidden field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4803,7 +4881,7 @@ exports[`single fields hidden field 1`] = `
             class="grid grid-cols-1 gap-4 "
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4862,7 +4940,7 @@ exports[`single fields hidden label 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4881,7 +4959,7 @@ exports[`single fields hidden label 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -4916,7 +4994,7 @@ exports[`single fields null field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-null"
+      class="flex-grow rjsf-field rjsf-field-null"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-null"
@@ -4956,7 +5034,7 @@ exports[`single fields number field 0 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="flex-grow rjsf-field rjsf-field-number"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -4983,7 +5061,7 @@ exports[`single fields number field 0 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -5019,7 +5097,7 @@ exports[`single fields number field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="flex-grow rjsf-field rjsf-field-number"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -5046,7 +5124,7 @@ exports[`single fields number field 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -5082,7 +5160,7 @@ exports[`single fields optional data controls does not show optional controls wh
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5110,7 +5188,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5138,7 +5216,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5169,7 +5247,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               </label>
                               <input
                                 aria-describedby="root_nestedObjectOptional_test__error root_nestedObjectOptional_test__description root_nestedObjectOptional_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_nestedObjectOptional_test"
                                 name="root_nestedObjectOptional_test"
                                 placeholder=""
@@ -5191,7 +5269,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5219,7 +5297,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5250,7 +5328,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObjectOptional_deepTest__error root_nestedObjectOptional_deepObjectOptional_deepTest__description root_nestedObjectOptional_deepObjectOptional_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_nestedObjectOptional_deepObjectOptional_deepTest"
                                           name="root_nestedObjectOptional_deepObjectOptional_deepTest"
                                           placeholder=""
@@ -5284,7 +5362,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5312,7 +5390,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5343,7 +5421,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObject_deepTest__error root_nestedObjectOptional_deepObject_deepTest__description root_nestedObjectOptional_deepObject_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_nestedObjectOptional_deepObject_deepTest"
                                           name="root_nestedObjectOptional_deepObject_deepTest"
                                           placeholder=""
@@ -5377,7 +5455,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5459,7 +5537,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5541,7 +5619,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5635,7 +5713,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5717,7 +5795,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5745,7 +5823,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5776,7 +5854,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
                                 placeholder=""
@@ -5810,7 +5888,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5892,7 +5970,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -5985,7 +6063,7 @@ exports[`single fields optional data controls does not show optional controls wh
                       </div>
                     </div>
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6013,7 +6091,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               class=""
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="flex-grow rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6044,7 +6122,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     </label>
                                     <input
                                       aria-describedby="root_optionalObjectWithOneofs_name__error root_optionalObjectWithOneofs_name__description root_optionalObjectWithOneofs_name__help"
-                                      class="input input-bordered"
+                                      class="input input-bordered w-full"
                                       disabled=""
                                       id="root_optionalObjectWithOneofs_name"
                                       name="root_optionalObjectWithOneofs_name"
@@ -6082,7 +6160,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -6175,7 +6253,7 @@ exports[`single fields optional data controls does not show optional controls wh
                       </div>
                     </div>
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6285,7 +6363,7 @@ exports[`single fields optional data controls does not show optional controls wh
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6313,7 +6391,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6341,7 +6419,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6372,7 +6450,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               </label>
                               <input
                                 aria-describedby="root_nestedObjectOptional_test__error root_nestedObjectOptional_test__description root_nestedObjectOptional_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 disabled=""
                                 id="root_nestedObjectOptional_test"
                                 name="root_nestedObjectOptional_test"
@@ -6395,7 +6473,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6423,7 +6501,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6454,7 +6532,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObjectOptional_deepTest__error root_nestedObjectOptional_deepObjectOptional_deepTest__description root_nestedObjectOptional_deepObjectOptional_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           disabled=""
                                           id="root_nestedObjectOptional_deepObjectOptional_deepTest"
                                           name="root_nestedObjectOptional_deepObjectOptional_deepTest"
@@ -6489,7 +6567,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6517,7 +6595,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6548,7 +6626,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObject_deepTest__error root_nestedObjectOptional_deepObject_deepTest__description root_nestedObjectOptional_deepObject_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           disabled=""
                                           id="root_nestedObjectOptional_deepObject_deepTest"
                                           name="root_nestedObjectOptional_deepObject_deepTest"
@@ -6583,7 +6661,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6666,7 +6744,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6749,7 +6827,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6844,7 +6922,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6927,7 +7005,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6955,7 +7033,7 @@ exports[`single fields optional data controls does not show optional controls wh
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6986,7 +7064,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 disabled=""
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
@@ -7021,7 +7099,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -7104,7 +7182,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -7197,7 +7275,7 @@ exports[`single fields optional data controls does not show optional controls wh
                       </div>
                     </div>
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -7225,7 +7303,7 @@ exports[`single fields optional data controls does not show optional controls wh
                               class=""
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="flex-grow rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7256,7 +7334,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     </label>
                                     <input
                                       aria-describedby="root_optionalObjectWithOneofs_name__error root_optionalObjectWithOneofs_name__description root_optionalObjectWithOneofs_name__help"
-                                      class="input input-bordered"
+                                      class="input input-bordered w-full"
                                       disabled=""
                                       id="root_optionalObjectWithOneofs_name"
                                       name="root_optionalObjectWithOneofs_name"
@@ -7294,7 +7372,7 @@ exports[`single fields optional data controls does not show optional controls wh
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -7387,7 +7465,7 @@ exports[`single fields optional data controls does not show optional controls wh
                       </div>
                     </div>
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -7498,7 +7576,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -7526,7 +7604,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -7587,7 +7665,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7618,7 +7696,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               </label>
                               <input
                                 aria-describedby="root_nestedObjectOptional_test__error root_nestedObjectOptional_test__description root_nestedObjectOptional_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_nestedObjectOptional_test"
                                 name="root_nestedObjectOptional_test"
                                 placeholder=""
@@ -7640,7 +7718,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -7712,7 +7790,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -7740,7 +7818,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7771,7 +7849,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObject_deepTest__error root_nestedObjectOptional_deepObject_deepTest__description root_nestedObjectOptional_deepObject_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_nestedObjectOptional_deepObject_deepTest"
                                           name="root_nestedObjectOptional_deepObject_deepTest"
                                           placeholder=""
@@ -7805,7 +7883,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -7887,7 +7965,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -7963,7 +8041,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8057,7 +8135,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8118,10 +8196,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg  z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg  z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8152,12 +8230,12 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                   <span
                                     class="label-text"
                                   >
-                                    nestedArrayOptional-0
+                                    nestedArrayOptional-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_nestedArrayOptional_0__error root_nestedArrayOptional_0__description root_nestedArrayOptional_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_nestedArrayOptional_0"
                                   name="root_nestedArrayOptional_0"
                                   placeholder=""
@@ -8176,7 +8254,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <button
                               aria-label="Remove"
@@ -8251,7 +8329,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8279,7 +8357,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8310,7 +8388,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
                                 placeholder=""
@@ -8344,7 +8422,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8426,7 +8504,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -8438,7 +8516,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8513,7 +8591,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -8525,7 +8603,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8629,7 +8707,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8657,7 +8735,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8685,7 +8763,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8716,7 +8794,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               </label>
                               <input
                                 aria-describedby="root_nestedObjectOptional_test__error root_nestedObjectOptional_test__description root_nestedObjectOptional_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 disabled=""
                                 id="root_nestedObjectOptional_test"
                                 name="root_nestedObjectOptional_test"
@@ -8739,7 +8817,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8784,7 +8862,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8812,7 +8890,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8843,7 +8921,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         </label>
                                         <input
                                           aria-describedby="root_nestedObjectOptional_deepObject_deepTest__error root_nestedObjectOptional_deepObject_deepTest__description root_nestedObjectOptional_deepObject_deepTest__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           disabled=""
                                           id="root_nestedObjectOptional_deepObject_deepTest"
                                           name="root_nestedObjectOptional_deepObject_deepTest"
@@ -8878,7 +8956,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8961,7 +9039,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9009,7 +9087,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-array"
+                          class="flex-grow rjsf-field rjsf-field-array"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9104,7 +9182,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9132,10 +9210,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg  z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg  z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -9166,12 +9244,12 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                   <span
                                     class="label-text"
                                   >
-                                    nestedArrayOptional-0
+                                    nestedArrayOptional-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_nestedArrayOptional_0__error root_nestedArrayOptional_0__description root_nestedArrayOptional_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   disabled=""
                                   id="root_nestedArrayOptional_0"
                                   name="root_nestedArrayOptional_0"
@@ -9191,7 +9269,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <button
                               aria-label="Remove"
@@ -9268,7 +9346,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -9296,7 +9374,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -9327,7 +9405,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 disabled=""
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
@@ -9362,7 +9440,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9445,7 +9523,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -9457,7 +9535,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -9505,7 +9583,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -9517,7 +9595,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9593,7 +9671,7 @@ exports[`single fields optional data controls shows "add" optional controls when
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -9621,7 +9699,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -9693,7 +9771,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9769,7 +9847,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -9797,7 +9875,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -9828,7 +9906,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
                                 placeholder=""
@@ -9862,7 +9940,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -9944,7 +10022,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -9956,7 +10034,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -10031,7 +10109,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -10043,7 +10121,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -10147,7 +10225,7 @@ exports[`single fields optional data controls shows "add" optional controls when
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -10176,7 +10254,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -10222,7 +10300,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -10271,7 +10349,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -10300,7 +10378,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -10332,7 +10410,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                               </label>
                               <input
                                 aria-describedby="root_nestedObject_test__error root_nestedObject_test__description root_nestedObject_test__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 disabled=""
                                 id="root_nestedObject_test"
                                 name="root_nestedObject_test"
@@ -10367,7 +10445,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -10451,7 +10529,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -10464,7 +10542,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-object"
+                      class="flex-grow rjsf-field rjsf-field-object"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -10513,7 +10591,7 @@ exports[`single fields optional data controls shows "add" optional controls when
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-undefined"
+                class="flex-grow rjsf-field rjsf-field-undefined"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -10526,7 +10604,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                       class="mb-4"
                     />
                     <div
-                      class="rjsf-field rjsf-field-array"
+                      class="flex-grow rjsf-field rjsf-field-array"
                     >
                       <div
                         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -10604,7 +10682,7 @@ exports[`single fields password field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -10631,7 +10709,7 @@ exports[`single fields password field 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -10666,7 +10744,7 @@ exports[`single fields radio field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -10740,7 +10818,7 @@ exports[`single fields radio widget with description in schema and FieldTemplate
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -10787,6 +10865,16 @@ exports[`single fields radio widget with description in schema and FieldTemplate
             </label>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            This is a radio description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -10814,7 +10902,7 @@ exports[`single fields schema examples 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -10841,7 +10929,7 @@ exports[`single fields schema examples 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help root__examples"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             list="root__examples"
             name="root"
@@ -10896,7 +10984,7 @@ exports[`single fields select field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -10990,7 +11078,7 @@ exports[`single fields select field multiple choice 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -11134,7 +11222,7 @@ exports[`single fields select field multiple choice enumDisabled 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -11278,7 +11366,7 @@ exports[`single fields select field multiple choice enumDisabled using checkboxe
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -11390,7 +11478,7 @@ exports[`single fields select field multiple choice formData 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -11536,7 +11624,7 @@ exports[`single fields select field multiple choice with labels 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-array"
+      class="flex-grow rjsf-field rjsf-field-array"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -11661,7 +11749,7 @@ exports[`single fields select field single choice enumDisabled 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -11755,7 +11843,7 @@ exports[`single fields select field single choice enumDisabled using radio widge
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -11837,7 +11925,7 @@ exports[`single fields select field single choice form disabled using radio widg
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -11923,7 +12011,7 @@ exports[`single fields select field single choice formData 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12019,7 +12107,7 @@ exports[`single fields select field single choice uiSchema disabled using radio
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12104,7 +12192,7 @@ exports[`single fields select widget with description in schema and FieldTemplat
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="flex-grow rjsf-field rjsf-field-boolean"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -12163,6 +12251,16 @@ exports[`single fields select widget with description in schema and FieldTemplat
             </ul>
           </div>
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            This is a select description
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -12190,7 +12288,7 @@ exports[`single fields slider field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-integer"
+      class="flex-grow rjsf-field rjsf-field-integer"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-integer"
@@ -12252,7 +12350,7 @@ exports[`single fields string field field with markdown help and description 1`]
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12283,7 +12381,7 @@ exports[`single fields string field field with markdown help and description 1`]
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12291,6 +12389,16 @@ exports[`single fields string field field with markdown help and description 1`]
             value=""
           />
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            This is a *description* with **markdown**
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -12335,7 +12443,7 @@ exports[`single fields string field field with markdown help text 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12366,7 +12474,7 @@ exports[`single fields string field field with markdown help text 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12374,6 +12482,16 @@ exports[`single fields string field field with markdown help text 1`] = `
             value=""
           />
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            A field with markdown help text
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -12418,7 +12536,7 @@ exports[`single fields string field field with markdown help text without enabli
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12449,7 +12567,7 @@ exports[`single fields string field field with markdown help text without enabli
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12457,6 +12575,16 @@ exports[`single fields string field field with markdown help text without enabli
             value=""
           />
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            A field with raw help text
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -12490,7 +12618,7 @@ exports[`single fields string field format data-url 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12518,7 +12646,7 @@ exports[`single fields string field format data-url 1`] = `
             </label>
             <input
               aria-describedby="root__error root__description root__help"
-              class="file-input w-full"
+              class="file-input"
               id="root"
               name="root"
               placeholder=""
@@ -12554,7 +12682,7 @@ exports[`single fields string field format email 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12581,7 +12709,7 @@ exports[`single fields string field format email 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12616,7 +12744,7 @@ exports[`single fields string field format uri 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12643,7 +12771,7 @@ exports[`single fields string field format uri 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12678,7 +12806,7 @@ exports[`single fields string field regular 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12705,7 +12833,7 @@ exports[`single fields string field regular 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12740,7 +12868,7 @@ exports[`single fields string field required field with markdown help 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12771,7 +12899,7 @@ exports[`single fields string field required field with markdown help 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -12779,6 +12907,16 @@ exports[`single fields string field required field with markdown help 1`] = `
             value="[object Object]"
           />
         </div>
+        <div
+          class="description-field my-4"
+          id="root__description"
+        >
+          <div
+            class="text-sm text-base-content/80"
+          >
+            A required field with markdown help
+          </div>
+        </div>
         <div
           class="rjsf-field-error-template text-red-600"
         >
@@ -12818,7 +12956,7 @@ exports[`single fields string field with placeholder 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12845,7 +12983,7 @@ exports[`single fields string field with placeholder 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder="placeholder"
@@ -12880,7 +13018,7 @@ exports[`single fields textarea field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12930,7 +13068,7 @@ exports[`single fields title field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -12958,7 +13096,7 @@ exports[`single fields title field 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -12989,7 +13127,7 @@ exports[`single fields title field 1`] = `
                     </label>
                     <input
                       aria-describedby="root_title__error root_title__description root_title__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_title"
                       name="root_title"
                       placeholder=""
@@ -13036,7 +13174,7 @@ exports[`single fields unsupported field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-undefined"
+      class="flex-grow rjsf-field rjsf-field-undefined"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-undefined"
@@ -13096,7 +13234,7 @@ exports[`single fields up/down field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="flex-grow rjsf-field rjsf-field-number"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -13123,7 +13261,7 @@ exports[`single fields up/down field 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
@@ -13158,7 +13296,7 @@ exports[`single fields using custom tagName 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="flex-grow rjsf-field rjsf-field-string"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -13185,7 +13323,7 @@ exports[`single fields using custom tagName 1`] = `
           </label>
           <input
             aria-describedby="root__error root__description root__help"
-            class="input input-bordered"
+            class="input input-bordered w-full"
             id="root"
             name="root"
             placeholder=""
diff --git a/packages/daisyui/test/__snapshots__/Grid.test.tsx.snap b/packages/daisyui/test/__snapshots__/Grid.test.tsx.snap
index 0e2ac7b73c..7c2b72596f 100644
--- a/packages/daisyui/test/__snapshots__/Grid.test.tsx.snap
+++ b/packages/daisyui/test/__snapshots__/Grid.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -22,7 +22,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -59,7 +59,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -95,7 +95,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_first"
                       name="root_person_name_first"
                       placeholder=""
@@ -119,7 +119,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -150,7 +150,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_middle"
                       name="root_person_name_middle"
                       placeholder=""
@@ -173,7 +173,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -209,7 +209,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_last__error root_person_name_last__description root_person_name_last__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_last"
                       name="root_person_name_last"
                       placeholder=""
@@ -237,7 +237,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -308,7 +308,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="8"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -421,6 +421,16 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       </label>
                     </div>
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_person_race__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      (Check all that apply)
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -440,7 +450,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -453,7 +463,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -489,7 +499,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_1"
                               name="root_person_address_line_1"
                               placeholder=""
@@ -513,7 +523,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -544,7 +554,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_2"
                               name="root_person_address_line_2"
                               placeholder=""
@@ -567,7 +577,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -603,7 +613,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_city"
                               name="root_person_address_city"
                               placeholder=""
@@ -630,7 +640,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1475,7 +1485,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1511,7 +1521,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                               </label>
                               <input
                                 aria-describedby="root_person_address_postal_code__error root_person_address_postal_code__description root_person_address_postal_code__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_address_postal_code"
                                 name="root_person_address_postal_code"
                                 placeholder=""
@@ -1551,7 +1561,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
               style="margin-top: 20px;"
               xs="12"
             >
-              <div>
+              <div
+                class="flex-grow undefined"
+              >
                 <div
                   class="field-template mb-3 "
                 >
@@ -1647,7 +1659,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1663,7 +1675,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1700,7 +1712,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1736,7 +1748,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_first"
                       name="root_person_name_first"
                       placeholder=""
@@ -1760,7 +1772,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1791,7 +1803,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_middle"
                       name="root_person_name_middle"
                       placeholder=""
@@ -1814,7 +1826,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1850,7 +1862,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_last__error root_person_name_last__description root_person_name_last__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_last"
                       name="root_person_name_last"
                       placeholder=""
@@ -1878,7 +1890,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1949,7 +1961,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="8"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -2062,6 +2074,16 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       </label>
                     </div>
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_person_race__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      (Check all that apply)
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -2081,7 +2103,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2094,7 +2116,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2130,7 +2152,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_1"
                               name="root_person_address_line_1"
                               placeholder=""
@@ -2154,7 +2176,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2185,7 +2207,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_2"
                               name="root_person_address_line_2"
                               placeholder=""
@@ -2208,7 +2230,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2244,7 +2266,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_city"
                               name="root_person_address_city"
                               placeholder=""
@@ -2271,7 +2293,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3116,7 +3138,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3152,7 +3174,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                               </label>
                               <input
                                 aria-describedby="root_person_address_postal_code__error root_person_address_postal_code__description root_person_address_postal_code__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_address_postal_code"
                                 name="root_person_address_postal_code"
                                 placeholder=""
@@ -3192,7 +3214,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
               style="margin-top: 20px;"
               xs="12"
             >
-              <div>
+              <div
+                class="flex-grow undefined"
+              >
                 <div
                   class="field-template mb-3 "
                 >
@@ -3288,7 +3312,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3304,7 +3328,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3341,7 +3365,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3377,7 +3401,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_first"
                       name="root_person_name_first"
                       placeholder=""
@@ -3401,7 +3425,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3432,7 +3456,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_middle"
                       name="root_person_name_middle"
                       placeholder=""
@@ -3455,7 +3479,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3491,7 +3515,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_last__error root_person_name_last__description root_person_name_last__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_last"
                       name="root_person_name_last"
                       placeholder=""
@@ -3519,7 +3543,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3590,7 +3614,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="8"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -3703,6 +3727,16 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       </label>
                     </div>
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_person_race__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      (Check all that apply)
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3722,7 +3756,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3735,7 +3769,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3771,7 +3805,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_1"
                               name="root_person_address_line_1"
                               placeholder=""
@@ -3795,7 +3829,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3826,7 +3860,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_2"
                               name="root_person_address_line_2"
                               placeholder=""
@@ -3849,7 +3883,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3885,7 +3919,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_city"
                               name="root_person_address_city"
                               placeholder=""
@@ -3912,7 +3946,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4757,7 +4791,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4793,7 +4827,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                               </label>
                               <input
                                 aria-describedby="root_person_address_postal_code__error root_person_address_postal_code__description root_person_address_postal_code__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_address_postal_code"
                                 name="root_person_address_postal_code"
                                 placeholder=""
@@ -4833,7 +4867,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
               style="margin-top: 20px;"
               xs="12"
             >
-              <div>
+              <div
+                class="flex-grow undefined"
+              >
                 <div
                   class="field-template mb-3 "
                 >
@@ -4929,7 +4965,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4945,7 +4981,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4982,7 +5018,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5018,7 +5054,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_first"
                       name="root_person_name_first"
                       placeholder=""
@@ -5042,7 +5078,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5073,7 +5109,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_middle"
                       name="root_person_name_middle"
                       placeholder=""
@@ -5096,7 +5132,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5132,7 +5168,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </label>
                     <input
                       aria-describedby="root_person_name_last__error root_person_name_last__description root_person_name_last__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_person_name_last"
                       name="root_person_name_last"
                       placeholder=""
@@ -5160,7 +5196,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="4"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5231,7 +5267,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="8"
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -5344,6 +5380,16 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       </label>
                     </div>
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_person_race__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      (Check all that apply)
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -5363,7 +5409,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               xs="12"
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -5376,7 +5422,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5412,7 +5458,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_1"
                               name="root_person_address_line_1"
                               placeholder=""
@@ -5436,7 +5482,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5467,7 +5513,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_line_2"
                               name="root_person_address_line_2"
                               placeholder=""
@@ -5490,7 +5536,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                       xs="12"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="flex-grow rjsf-field rjsf-field-string"
                       >
                         <div
                           class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -5526,7 +5572,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                             </label>
                             <input
                               aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                              class="input input-bordered"
+                              class="input input-bordered w-full"
                               id="root_person_address_city"
                               name="root_person_address_city"
                               placeholder=""
@@ -5553,7 +5599,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6398,7 +6444,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                         xs="6"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6434,7 +6480,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                               </label>
                               <input
                                 aria-describedby="root_person_address_postal_code__error root_person_address_postal_code__description root_person_address_postal_code__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_address_postal_code"
                                 name="root_person_address_postal_code"
                                 placeholder=""
@@ -6474,7 +6520,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
               style="margin-top: 20px;"
               xs="12"
             >
-              <div>
+              <div
+                class="flex-grow undefined"
+              >
                 <div
                   class="field-template mb-3 "
                 >
@@ -6570,7 +6618,7 @@ exports[`Three even column grid renders person and address in three columns, no
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6583,7 +6631,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="24"
           >
             <div
-              class="rjsf-field rjsf-field-object"
+              class="flex-grow rjsf-field rjsf-field-object"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -6616,7 +6664,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6652,7 +6700,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_first"
                     name="root_person_name_first"
                     placeholder=""
@@ -6676,7 +6724,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6707,7 +6755,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_middle"
                     name="root_person_name_middle"
                     placeholder=""
@@ -6730,7 +6778,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6766,7 +6814,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_name_last__error root_person_name_last__description root_person_name_last__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_last"
                     name="root_person_name_last"
                     placeholder=""
@@ -6790,7 +6838,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -6861,7 +6909,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="16"
           >
             <div
-              class="rjsf-field rjsf-field-array"
+              class="flex-grow rjsf-field rjsf-field-array"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -6974,6 +7022,16 @@ exports[`Three even column grid renders person and address in three columns, no
                     </label>
                   </div>
                 </div>
+                <div
+                  class="description-field my-4"
+                  id="root_person_race__description"
+                >
+                  <div
+                    class="text-sm text-base-content/80"
+                  >
+                    (Check all that apply)
+                  </div>
+                </div>
                 <div
                   class="rjsf-field-error-template text-red-600"
                 >
@@ -6989,7 +7047,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7025,7 +7083,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_line_1"
                     name="root_person_address_line_1"
                     placeholder=""
@@ -7049,7 +7107,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7080,7 +7138,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_line_2"
                     name="root_person_address_line_2"
                     placeholder=""
@@ -7103,7 +7161,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -7139,7 +7197,7 @@ exports[`Three even column grid renders person and address in three columns, no
                   </label>
                   <input
                     aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_city"
                     name="root_person_address_city"
                     placeholder=""
@@ -7163,7 +7221,7 @@ exports[`Three even column grid renders person and address in three columns, no
             xs="8"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8035,7 +8093,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8048,7 +8106,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="24"
           >
             <div
-              class="rjsf-field rjsf-field-object"
+              class="flex-grow rjsf-field rjsf-field-object"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -8081,7 +8139,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8117,7 +8175,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_first"
                     name="root_person_name_first"
                     placeholder=""
@@ -8141,7 +8199,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8172,7 +8230,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_name_middle__error root_person_name_middle__description root_person_name_middle__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_middle"
                     name="root_person_name_middle"
                     placeholder=""
@@ -8195,7 +8253,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8231,7 +8289,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_name_first__error root_person_name_first__description root_person_name_first__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_name_first"
                     name="root_person_name_first"
                     placeholder=""
@@ -8255,7 +8313,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8326,7 +8384,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="24"
           >
             <div
-              class="rjsf-field rjsf-field-array"
+              class="flex-grow rjsf-field rjsf-field-array"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -8439,6 +8497,16 @@ exports[`Two even column grid renders person and address in two columns, no empl
                     </label>
                   </div>
                 </div>
+                <div
+                  class="description-field my-4"
+                  id="root_person_race__description"
+                >
+                  <div
+                    class="text-sm text-base-content/80"
+                  >
+                    (Check all that apply)
+                  </div>
+                </div>
                 <div
                   class="rjsf-field-error-template text-red-600"
                 >
@@ -8454,7 +8522,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8490,7 +8558,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_address_line_1__error root_person_address_line_1__description root_person_address_line_1__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_line_1"
                     name="root_person_address_line_1"
                     placeholder=""
@@ -8514,7 +8582,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8545,7 +8613,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_address_line_2__error root_person_address_line_2__description root_person_address_line_2__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_line_2"
                     name="root_person_address_line_2"
                     placeholder=""
@@ -8568,7 +8636,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -8604,7 +8672,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
                   </label>
                   <input
                     aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                    class="input input-bordered"
+                    class="input input-bordered w-full"
                     id="root_person_address_city"
                     name="root_person_address_city"
                     placeholder=""
@@ -8628,7 +8696,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             xs="12"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="flex-grow rjsf-field rjsf-field-string"
             >
               <div
                 class="field-template mb-3 rjsf-field rjsf-field-string"
diff --git a/packages/daisyui/test/__snapshots__/Object.test.tsx.snap b/packages/daisyui/test/__snapshots__/Object.test.tsx.snap
index 33d8986180..7444c8eaf5 100644
--- a/packages/daisyui/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/daisyui/test/__snapshots__/Object.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -21,7 +21,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -49,7 +49,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -80,7 +80,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_name__error root_person_name__description root_person_name__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_name"
                                 name="root[person][name]"
                                 placeholder=""
@@ -102,7 +102,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -130,7 +130,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -161,7 +161,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_street__error root_person_address_street__description root_person_address_street__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_street"
                                           name="root[person][address][street]"
                                           placeholder=""
@@ -183,7 +183,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -214,7 +214,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_city"
                                           name="root[person][address][city]"
                                           placeholder=""
@@ -236,7 +236,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -267,7 +267,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_country__error root_person_address_country__description root_person_address_country__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_country"
                                           name="root[person][address][country]"
                                           placeholder=""
@@ -338,7 +338,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -353,7 +353,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -384,7 +384,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root[name]"
                       placeholder=""
@@ -459,7 +459,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
                       </label>
                       <input
                         aria-describedby="root_customField__error root_customField__description root_customField__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_customField"
                         name="root[customField]"
                         placeholder=""
@@ -565,7 +565,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -580,7 +580,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -611,7 +611,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root[name]"
                       placeholder=""
@@ -633,7 +633,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -664,7 +664,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     </label>
                     <input
                       aria-describedby="root_age__error root_age__description root_age__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_age"
                       name="root[age]"
                       placeholder=""
@@ -687,7 +687,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-boolean"
+                class="flex-grow rjsf-field rjsf-field-boolean"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-boolean"
@@ -730,7 +730,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -758,10 +758,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -792,12 +792,12 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-0
+                                    tags-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_0__error root_tags_0__description root_tags_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_0"
                                   name="root[tags][0]"
                                   placeholder=""
@@ -816,7 +816,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -889,10 +889,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -923,12 +923,12 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    tags-1
+                                    tags-2
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_tags_1__error root_tags_1__description root_tags_1__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_tags_1"
                                   name="root[tags][1]"
                                   placeholder=""
@@ -947,7 +947,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -1094,7 +1094,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1109,7 +1109,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1140,7 +1140,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_firstName__error root_firstName__description root_firstName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_firstName"
                       name="root[firstName]"
                       placeholder=""
@@ -1162,7 +1162,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1193,7 +1193,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_lastName__error root_lastName__description root_lastName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_lastName"
                       name="root[lastName]"
                       placeholder=""
@@ -1215,7 +1215,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -1246,7 +1246,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_age__error root_age__description root_age__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_age"
                       name="root[age]"
                       placeholder=""
@@ -1294,7 +1294,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1309,7 +1309,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-object"
+                class="flex-grow rjsf-field rjsf-field-object"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1337,7 +1337,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="flex-grow rjsf-field rjsf-field-string"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1368,7 +1368,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                               </label>
                               <input
                                 aria-describedby="root_person_name__error root_person_name__description root_person_name__help"
-                                class="input input-bordered"
+                                class="input input-bordered w-full"
                                 id="root_person_name"
                                 name="root.person.name"
                                 placeholder=""
@@ -1390,7 +1390,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         class=""
                       >
                         <div
-                          class="rjsf-field rjsf-field-object"
+                          class="flex-grow rjsf-field rjsf-field-object"
                         >
                           <div
                             class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1418,7 +1418,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1449,7 +1449,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_street__error root_person_address_street__description root_person_address_street__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_street"
                                           name="root.person.address.street"
                                           placeholder=""
@@ -1471,7 +1471,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                   class=""
                                 >
                                   <div
-                                    class="rjsf-field rjsf-field-string"
+                                    class="flex-grow rjsf-field rjsf-field-string"
                                   >
                                     <div
                                       class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1502,7 +1502,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                                         </label>
                                         <input
                                           aria-describedby="root_person_address_city__error root_person_address_city__description root_person_address_city__help"
-                                          class="input input-bordered"
+                                          class="input input-bordered w-full"
                                           id="root_person_address_city"
                                           name="root.person.address.city"
                                           placeholder=""
@@ -1573,7 +1573,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -1588,7 +1588,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1619,7 +1619,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     </label>
                     <input
                       aria-describedby="root_name__error root_name__description root_name__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_name"
                       name="root.name"
                       placeholder=""
@@ -1641,7 +1641,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -1672,7 +1672,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     </label>
                     <input
                       aria-describedby="root_count__error root_count__description root_count__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_count"
                       name="root.count"
                       placeholder=""
@@ -1695,7 +1695,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-array"
+                class="flex-grow rjsf-field rjsf-field-array"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-array"
@@ -1723,10 +1723,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                         class="rjsf-array-item-list"
                       >
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-t-lg mb-[-1px] z-10"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-t-lg mb-[-1px] z-10"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1757,12 +1757,12 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    items-0
+                                    items-1
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_items_0__error root_items_0__description root_items_0__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_items_0"
                                   name="root.items.0"
                                   placeholder=""
@@ -1781,7 +1781,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -1854,10 +1854,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                           </div>
                         </fieldset>
                         <fieldset
-                          class="fieldset bg-base-100 border border-base-300 p-4 rounded-b-lg  z-9"
+                          class="fieldset bg-base-100 border border-base-300 p-4 flex rounded-b-lg  z-9"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="flex-grow rjsf-field rjsf-field-string"
                           >
                             <div
                               class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -1888,12 +1888,12 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                   <span
                                     class="label-text"
                                   >
-                                    items-1
+                                    items-2
                                   </span>
                                 </label>
                                 <input
                                   aria-describedby="root_items_1__error root_items_1__description root_items_1__help"
-                                  class="input input-bordered"
+                                  class="input input-bordered w-full"
                                   id="root_items_1"
                                   name="root.items.1"
                                   placeholder=""
@@ -1912,7 +1912,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="flex justify-end mt-2"
+                            class="flex justify-end mt-5"
                           >
                             <div
                               class="join"
@@ -2059,7 +2059,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2074,7 +2074,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2105,7 +2105,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_firstName__error root_firstName__description root_firstName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_firstName"
                       name="root.firstName"
                       placeholder=""
@@ -2127,7 +2127,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2158,7 +2158,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_lastName__error root_lastName__description root_lastName__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_lastName"
                       name="root.lastName"
                       placeholder=""
@@ -2180,7 +2180,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -2211,7 +2211,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_age__error root_age__description root_age__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_age"
                       name="root.age"
                       placeholder=""
@@ -2259,7 +2259,7 @@ exports[`object fields additionalProperties 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2327,7 +2327,7 @@ exports[`object fields additionalProperties 1`] = `
                       </label>
                       <input
                         aria-describedby="root_foo__error root_foo__description root_foo__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_foo"
                         name="root_foo"
                         placeholder=""
@@ -2433,7 +2433,7 @@ exports[`object fields object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2448,7 +2448,7 @@ exports[`object fields object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -2479,7 +2479,7 @@ exports[`object fields object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_a__error root_a__description root_a__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_a"
                       name="root_a"
                       placeholder=""
@@ -2501,7 +2501,7 @@ exports[`object fields object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -2532,7 +2532,7 @@ exports[`object fields object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_b__error root_b__description root_b__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_b"
                       name="root_b"
                       placeholder=""
@@ -2580,7 +2580,7 @@ exports[`object fields show add button and fields if additionalProperties is tru
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2648,7 +2648,7 @@ exports[`object fields show add button and fields if additionalProperties is tru
                       </label>
                       <input
                         aria-describedby="root_additionalProperty__error root_additionalProperty__description root_additionalProperty__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_additionalProperty"
                         name="root_additionalProperty"
                         placeholder=""
@@ -2754,7 +2754,7 @@ exports[`object fields with title and description additionalProperties 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -2845,7 +2845,7 @@ exports[`object fields with title and description additionalProperties 1`] = `
                       </label>
                       <input
                         aria-describedby="root_foo__error root_foo__description root_foo__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_foo"
                         name="root_foo"
                         placeholder=""
@@ -2951,7 +2951,7 @@ exports[`object fields with title and description from both additionalProperties
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3042,7 +3042,7 @@ exports[`object fields with title and description from both additionalProperties
                       </label>
                       <input
                         aria-describedby="root_foo__error root_foo__description root_foo__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_foo"
                         name="root_foo"
                         placeholder=""
@@ -3148,7 +3148,7 @@ exports[`object fields with title and description from both object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3186,7 +3186,7 @@ exports[`object fields with title and description from both object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3217,7 +3217,7 @@ exports[`object fields with title and description from both object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_a__error root_a__description root_a__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_a"
                       name="root_a"
                       placeholder=""
@@ -3225,6 +3225,16 @@ exports[`object fields with title and description from both object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_a__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      a fancier item A description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3239,7 +3249,7 @@ exports[`object fields with title and description from both object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -3270,7 +3280,7 @@ exports[`object fields with title and description from both object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_b__error root_b__description root_b__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_b"
                       name="root_b"
                       placeholder=""
@@ -3279,6 +3289,16 @@ exports[`object fields with title and description from both object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_b__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      a fancier item B description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3318,7 +3338,7 @@ exports[`object fields with title and description from uiSchema additionalProper
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3409,7 +3429,7 @@ exports[`object fields with title and description from uiSchema additionalProper
                       </label>
                       <input
                         aria-describedby="root_foo__error root_foo__description root_foo__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_foo"
                         name="root_foo"
                         placeholder=""
@@ -3515,7 +3535,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3553,7 +3573,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3584,7 +3604,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_a__error root_a__description root_a__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_a"
                       name="root_a"
                       placeholder=""
@@ -3592,6 +3612,16 @@ exports[`object fields with title and description from uiSchema object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_a__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      a fancier item A description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3606,7 +3636,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -3637,7 +3667,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_b__error root_b__description root_b__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_b"
                       name="root_b"
                       placeholder=""
@@ -3646,6 +3676,16 @@ exports[`object fields with title and description from uiSchema object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_b__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      a fancier item B description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3685,7 +3725,7 @@ exports[`object fields with title and description from uiSchema show add button
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3776,7 +3816,7 @@ exports[`object fields with title and description from uiSchema show add button
                       </label>
                       <input
                         aria-describedby="root_additionalProperty__error root_additionalProperty__description root_additionalProperty__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_additionalProperty"
                         name="root_additionalProperty"
                         placeholder=""
@@ -3882,7 +3922,7 @@ exports[`object fields with title and description object 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -3920,7 +3960,7 @@ exports[`object fields with title and description object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -3951,7 +3991,7 @@ exports[`object fields with title and description object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_a__error root_a__description root_a__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_a"
                       name="root_a"
                       placeholder=""
@@ -3959,6 +3999,16 @@ exports[`object fields with title and description object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_a__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      A description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -3973,7 +4023,7 @@ exports[`object fields with title and description object 1`] = `
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -4004,7 +4054,7 @@ exports[`object fields with title and description object 1`] = `
                     </label>
                     <input
                       aria-describedby="root_b__error root_b__description root_b__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_b"
                       name="root_b"
                       placeholder=""
@@ -4013,6 +4063,16 @@ exports[`object fields with title and description object 1`] = `
                       value=""
                     />
                   </div>
+                  <div
+                    class="description-field my-4"
+                    id="root_b__description"
+                  >
+                    <div
+                      class="text-sm text-base-content/80"
+                    >
+                      B description
+                    </div>
+                  </div>
                   <div
                     class="rjsf-field-error-template text-red-600"
                   >
@@ -4052,7 +4112,7 @@ exports[`object fields with title and description show add button and fields if
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4143,7 +4203,7 @@ exports[`object fields with title and description show add button and fields if
                       </label>
                       <input
                         aria-describedby="root_additionalProperty__error root_additionalProperty__description root_additionalProperty__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_additionalProperty"
                         name="root_additionalProperty"
                         placeholder=""
@@ -4249,7 +4309,7 @@ exports[`object fields with title and description with global label off addition
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4307,7 +4367,7 @@ exports[`object fields with title and description with global label off addition
                       </label>
                       <input
                         aria-describedby="root_foo__error root_foo__description root_foo__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_foo"
                         name="root_foo"
                         placeholder=""
@@ -4413,7 +4473,7 @@ exports[`object fields with title and description with global label off object 1
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4428,7 +4488,7 @@ exports[`object fields with title and description with global label off object 1
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="flex-grow rjsf-field rjsf-field-string"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-string"
@@ -4449,7 +4509,7 @@ exports[`object fields with title and description with global label off object 1
                     </label>
                     <input
                       aria-describedby="root_a__error root_a__description root_a__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_a"
                       name="root_a"
                       placeholder=""
@@ -4471,7 +4531,7 @@ exports[`object fields with title and description with global label off object 1
               class=""
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="flex-grow rjsf-field rjsf-field-number"
               >
                 <div
                   class="field-template mb-3 rjsf-field rjsf-field-number"
@@ -4492,7 +4552,7 @@ exports[`object fields with title and description with global label off object 1
                     </label>
                     <input
                       aria-describedby="root_b__error root_b__description root_b__help"
-                      class="input input-bordered"
+                      class="input input-bordered w-full"
                       id="root_b"
                       name="root_b"
                       placeholder=""
@@ -4540,7 +4600,7 @@ exports[`object fields with title and description with global label off show add
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="flex-grow rjsf-field rjsf-field-object"
     >
       <div
         class="field-template mb-3 rjsf-field rjsf-field-object"
@@ -4598,7 +4658,7 @@ exports[`object fields with title and description with global label off show add
                       </label>
                       <input
                         aria-describedby="root_additionalProperty__error root_additionalProperty__description root_additionalProperty__help"
-                        class="input input-bordered"
+                        class="input input-bordered w-full"
                         id="root_additionalProperty"
                         name="root_additionalProperty"
                         placeholder=""
diff --git a/packages/docs/docs/api-reference/uiSchema.md b/packages/docs/docs/api-reference/uiSchema.md
index 3c0df2eaff..97aac947bc 100644
--- a/packages/docs/docs/api-reference/uiSchema.md
+++ b/packages/docs/docs/api-reference/uiSchema.md
@@ -244,6 +244,43 @@ const uiSchema: UiSchema = {
 render(<Form schema={schema} uiSchema={uiSchema} validator={validator} />, document.getElementById('app'));
 ```
 
+### enableMarkdownInHelp
+
+The `ui:enableMarkdownInHelp` uiSchema directive enables the support of Markdown syntax within the help displayed for
+a field.
+
+```tsx
+import { Form } from '@rjsf/core';
+import { RJSFSchema, UiSchema } from '@rjsf/utils';
+import validator from '@rjsf/validator-ajv8';
+
+const schema: RJSFSchema = { type: 'string' };
+const uiSchema: UiSchema = {
+  'ui:enableMarkdownInHelp': true,
+  'ui:help': '**bolded** text in the help',
+};
+render(<Form schema={schema} uiSchema={uiSchema} validator={validator} />, document.getElementById('app'));
+```
+
+It can also be enabled globally by setting the `enableMarkdownInHelp` option to `true` in the `ui:globalOptions`
+uiSchema directive.
+
+```tsx
+import { Form } from '@rjsf/core';
+import { RJSFSchema, UiSchema } from '@rjsf/utils';
+import validator from '@rjsf/validator-ajv8';
+
+const schema: RJSFSchema = { type: 'string' };
+const uiSchema: UiSchema = {
+  'ui:globalOptions': {
+    enableMarkdownInHelp: true,
+  },
+  'ui:help': '**bolded** text in the help',
+};
+
+render(<Form schema={schema} uiSchema={uiSchema} validator={validator} />, document.getElementById('app'));
+```
+
 ### enableOptionalDataFieldForType
 
 The `ui:enableOptionalDataFieldForType` uiSchema directive enables support for displaying the `Optional Data Controls` feature.
diff --git a/packages/fluentui-rc/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/fluentui-rc/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index 25653d38b1..4ca4df7712 100644
--- a/packages/fluentui-rc/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/fluentui-rc/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -27,7 +27,7 @@ export default function ArrayFieldItemTemplate<
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
   const classes = useStyles();
-  const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;
+  const { children, buttonsProps, displayLabel, hasToolbar, uiSchema, registry } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -36,12 +36,12 @@ export default function ArrayFieldItemTemplate<
   );
 
   return (
-    <Flex vAlign='end'>
+    <Flex vAlign='start'>
       <Flex fill className={classes.arrayFieldItem}>
         {children}
       </Flex>
       {hasToolbar && (
-        <Flex style={{ marginLeft: '8px' }}>
+        <Flex style={{ marginLeft: '8px', marginTop: displayLabel ? '26px' : 0 }}>
           <ArrayFieldItemButtonsTemplate {...buttonsProps} />
         </Flex>
       )}
diff --git a/packages/fluentui-rc/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx b/packages/fluentui-rc/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
index 31a0d05e9d..6619baaee4 100644
--- a/packages/fluentui-rc/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
+++ b/packages/fluentui-rc/src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx
@@ -15,11 +15,16 @@ const useStyles = makeStyles({
   input: {
     width: '100%',
   },
+  grow: {
+    flexGrow: 1,
+  },
   label: {
     marginBottom: '4px',
   },
 });
 
+const containerTypes = ['object', 'array'];
+
 /** The `WrapIfAdditional` component is used by the `FieldTemplate` to rename, or remove properties that are
  * part of an `additionalProperties` part of a schema.
  *
@@ -59,8 +64,11 @@ export default function WrapIfAdditionalTemplate<
   };
 
   if (!additional) {
+    const { type } = schema;
+    // Flex grow only non container classes
+    const className = containerTypes.includes(type as string) ? classNames : `${classes.grow} ${classNames}`;
     return (
-      <div className={classNames} style={style}>
+      <div className={className} style={style}>
         {children}
       </div>
     );
diff --git a/packages/fluentui-rc/test/__snapshots__/Array.test.tsx.snap b/packages/fluentui-rc/test/__snapshots__/Array.test.tsx.snap
index c00654db72..8ac91843e2 100644
--- a/packages/fluentui-rc/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/fluentui-rc/test/__snapshots__/Array.test.tsx.snap
@@ -75,13 +75,13 @@ exports[`array fields array icons 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -116,7 +116,7 @@ exports[`array fields array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -222,13 +222,13 @@ exports[`array fields array icons 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -263,7 +263,7 @@ exports[`array fields array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -504,7 +504,7 @@ exports[`array fields empty errors array 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -563,13 +563,13 @@ exports[`array fields fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -604,13 +604,13 @@ exports[`array fields fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -696,7 +696,7 @@ exports[`array fields has errors 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string rjsf-field-error"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string rjsf-field-error"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -774,7 +774,7 @@ exports[`array fields no errors 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -833,7 +833,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -852,7 +852,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -884,7 +884,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-number"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -918,7 +918,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -999,7 +999,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -1018,7 +1018,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1050,7 +1050,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-number"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1084,7 +1084,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -1225,13 +1225,13 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1266,7 +1266,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -1347,13 +1347,13 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1388,7 +1388,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -1600,13 +1600,13 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1641,13 +1641,13 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1683,13 +1683,13 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-boolean"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1765,7 +1765,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -1780,13 +1780,13 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                   >
                     <div
-                      class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                      class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                     >
                       <div
                         class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                         >
                           <div
                             class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1821,7 +1821,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                       <div
                         class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                        style="margin-left: 8px;"
+                        style="margin-left: 8px; margin-top: 26px;"
                       >
                         <button
                           class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -1902,13 +1902,13 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                     </div>
                     <div
-                      class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                      class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                     >
                       <div
                         class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                         >
                           <div
                             class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1943,7 +1943,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                       <div
                         class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                        style="margin-left: 8px;"
+                        style="margin-left: 8px; margin-top: 26px;"
                       >
                         <button
                           class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2058,7 +2058,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -2139,7 +2139,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -2154,13 +2154,13 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                   >
                     <div
-                      class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                      class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                     >
                       <div
                         class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                         >
                           <div
                             class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2195,7 +2195,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                       <div
                         class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                        style="margin-left: 8px;"
+                        style="margin-left: 8px; margin-top: 26px;"
                       >
                         <button
                           class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -2276,13 +2276,13 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                     </div>
                     <div
-                      class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                      class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                     >
                       <div
                         class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                       >
                         <div
-                          class="rjsf-field rjsf-field-string"
+                          class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                         >
                           <div
                             class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2317,7 +2317,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                       <div
                         class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                        style="margin-left: 8px;"
+                        style="margin-left: 8px; margin-top: 26px;"
                       >
                         <button
                           class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2432,7 +2432,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2573,7 +2573,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -2592,7 +2592,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2624,7 +2624,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-number"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2658,7 +2658,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -2739,7 +2739,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -2758,7 +2758,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2790,7 +2790,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       style="margin-bottom: 10px;"
                     >
                       <div
-                        class="rjsf-field rjsf-field-number"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2824,7 +2824,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2965,13 +2965,13 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3006,7 +3006,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -3087,13 +3087,13 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3128,7 +3128,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -3373,13 +3373,13 @@ exports[`with title and description array icons 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3388,7 +3388,7 @@ exports[`with title and description array icons 1`] = `
                     class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                     for="root_0"
                   >
-                    Test item
+                    Test field-1
                     <span
                       aria-hidden="true"
                       class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -3426,7 +3426,7 @@ exports[`with title and description array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -3532,13 +3532,13 @@ exports[`with title and description array icons 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3547,7 +3547,7 @@ exports[`with title and description array icons 1`] = `
                     class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                     for="root_1"
                   >
-                    Test item
+                    Test field-2
                     <span
                       aria-hidden="true"
                       class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -3585,7 +3585,7 @@ exports[`with title and description array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -3857,13 +3857,13 @@ exports[`with title and description fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3872,7 +3872,7 @@ exports[`with title and description fixed array 1`] = `
                     class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                     for="root_0"
                   >
-                    Test item
+                    Test field-1
                     <span
                       aria-hidden="true"
                       class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -3910,13 +3910,13 @@ exports[`with title and description fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3925,7 +3925,7 @@ exports[`with title and description fixed array 1`] = `
                     class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                     for="root_1"
                   >
-                    Test item
+                    Test field-2
                     <span
                       aria-hidden="true"
                       class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -4099,13 +4099,13 @@ exports[`with title and description from both array icons 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4152,7 +4152,7 @@ exports[`with title and description from both array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -4258,13 +4258,13 @@ exports[`with title and description from both array icons 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4311,7 +4311,7 @@ exports[`with title and description from both array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -4583,13 +4583,13 @@ exports[`with title and description from both fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4636,13 +4636,13 @@ exports[`with title and description from both fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4825,13 +4825,13 @@ exports[`with title and description from uiSchema array icons 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4878,7 +4878,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -4984,13 +4984,13 @@ exports[`with title and description from uiSchema array icons 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5037,7 +5037,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 26px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -5309,13 +5309,13 @@ exports[`with title and description from uiSchema fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5362,13 +5362,13 @@ exports[`with title and description from uiSchema fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5507,13 +5507,13 @@ exports[`with title and description with global label off array icons 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5537,7 +5537,7 @@ exports[`with title and description with global label off array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -5643,13 +5643,13 @@ exports[`with title and description with global label off array icons 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5673,7 +5673,7 @@ exports[`with title and description with global label off array icons 1`] = `
             </div>
             <div
               class="fui-Flex ___1gzszts_10anl4a f22iagw"
-              style="margin-left: 8px;"
+              style="margin-left: 8px; margin-top: 0px;"
             >
               <button
                 class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -5923,13 +5923,13 @@ exports[`with title and description with global label off fixed array 1`] = `
           class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
         >
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5953,13 +5953,13 @@ exports[`with title and description with global label off fixed array 1`] = `
             </div>
           </div>
           <div
-            class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+            class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
           >
             <div
               class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
             >
               <div
-                class="rjsf-field rjsf-field-number"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
diff --git a/packages/fluentui-rc/test/__snapshots__/Form.test.tsx.snap b/packages/fluentui-rc/test/__snapshots__/Form.test.tsx.snap
index 4145c3c448..384a5cb152 100644
--- a/packages/fluentui-rc/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/fluentui-rc/test/__snapshots__/Form.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -79,7 +79,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -111,7 +111,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-boolean"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -146,7 +146,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 0px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -227,7 +227,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -262,7 +262,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -294,7 +294,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-boolean"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -345,7 +345,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 0px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -519,13 +519,13 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -534,7 +534,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_0"
                           >
-                            tags-0
+                            tags-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -561,7 +561,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -642,13 +642,13 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -657,7 +657,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_1"
                           >
-                            tags-1
+                            tags-2
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -684,7 +684,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -979,7 +979,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1011,7 +1011,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1072,7 +1072,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1104,7 +1104,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1175,7 +1175,7 @@ exports[`nameGenerator bracketNameGenerator radio field 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1276,7 +1276,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1386,7 +1386,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1418,7 +1418,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1451,7 +1451,7 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-boolean"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1516,7 +1516,7 @@ exports[`nameGenerator bracketNameGenerator textarea field 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1603,7 +1603,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -1638,7 +1638,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1670,7 +1670,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-boolean"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1705,7 +1705,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 0px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -1786,7 +1786,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
@@ -1821,7 +1821,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-string"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1853,7 +1853,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               style="margin-bottom: 10px;"
                             >
                               <div
-                                class="rjsf-field rjsf-field-boolean"
+                                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
                               >
                                 <div
                                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1904,7 +1904,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 0px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2078,13 +2078,13 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2093,7 +2093,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_0"
                           >
-                            tags-0
+                            tags-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -2120,7 +2120,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -2201,13 +2201,13 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2216,7 +2216,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_1"
                           >
-                            tags-1
+                            tags-2
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -2243,7 +2243,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -2421,7 +2421,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2453,7 +2453,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2514,7 +2514,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2546,7 +2546,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2617,7 +2617,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2727,7 +2727,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2759,7 +2759,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2792,7 +2792,7 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-boolean"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2844,7 +2844,7 @@ exports[`single fields checkbox field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2890,7 +2890,7 @@ exports[`single fields checkbox field with description in schema and FieldTempla
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2944,7 +2944,7 @@ exports[`single fields checkbox field with label 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2992,7 +2992,7 @@ exports[`single fields checkbox field with label and description 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3046,7 +3046,7 @@ exports[`single fields checkbox field with label and rich text description 1`] =
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3486,7 +3486,7 @@ exports[`single fields field with description 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3560,7 +3560,7 @@ exports[`single fields field with description in uiSchema 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3634,7 +3634,7 @@ exports[`single fields field with markdown description 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3714,7 +3714,7 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3777,7 +3777,7 @@ exports[`single fields format color 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3821,7 +3821,7 @@ exports[`single fields format date 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3865,7 +3865,7 @@ exports[`single fields format datetime 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3909,7 +3909,7 @@ exports[`single fields format time 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3968,7 +3968,7 @@ exports[`single fields help and error display 1`] = `
       </ul>
     </div>
     <div
-      class="rjsf-field rjsf-field-string rjsf-field-error"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string rjsf-field-error"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4074,7 +4074,7 @@ exports[`single fields hidden label 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4114,7 +4114,7 @@ exports[`single fields null field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-null"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-null"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4140,7 +4140,7 @@ exports[`single fields number field 0 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4185,7 +4185,7 @@ exports[`single fields number field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4230,7 +4230,7 @@ exports[`single fields optional data controls does not show optional controls wh
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4288,7 +4288,7 @@ exports[`single fields optional data controls does not show optional controls wh
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4349,7 +4349,7 @@ exports[`single fields optional data controls does not show optional controls wh
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4414,7 +4414,7 @@ exports[`single fields optional data controls does not show optional controls wh
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4731,7 +4731,7 @@ exports[`single fields optional data controls does not show optional controls wh
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4829,7 +4829,7 @@ exports[`single fields optional data controls does not show optional controls wh
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4936,7 +4936,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           style="margin-bottom: 10px;"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                           >
                             <div
                               class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4976,7 +4976,7 @@ exports[`single fields optional data controls does not show optional controls wh
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5137,7 +5137,7 @@ exports[`single fields optional data controls does not show optional controls wh
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5195,7 +5195,7 @@ exports[`single fields optional data controls does not show optional controls wh
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5257,7 +5257,7 @@ exports[`single fields optional data controls does not show optional controls wh
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5323,7 +5323,7 @@ exports[`single fields optional data controls does not show optional controls wh
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5645,7 +5645,7 @@ exports[`single fields optional data controls does not show optional controls wh
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5745,7 +5745,7 @@ exports[`single fields optional data controls does not show optional controls wh
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5852,7 +5852,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           style="margin-bottom: 10px;"
                         >
                           <div
-                            class="rjsf-field rjsf-field-string"
+                            class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                           >
                             <div
                               class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -5892,7 +5892,7 @@ exports[`single fields optional data controls does not show optional controls wh
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6054,7 +6054,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6149,7 +6149,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6279,7 +6279,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6574,13 +6574,13 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6589,7 +6589,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_nestedArrayOptional_0"
                           >
-                            nestedArrayOptional-0
+                            nestedArrayOptional-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -6616,7 +6616,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-remove ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -6712,7 +6712,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6810,7 +6810,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6892,7 +6892,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -6992,7 +6992,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7050,7 +7050,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7150,7 +7150,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7380,13 +7380,13 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7395,7 +7395,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_nestedArrayOptional_0"
                           >
-                            nestedArrayOptional-0
+                            nestedArrayOptional-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -7423,7 +7423,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-remove ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -7521,7 +7521,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7621,7 +7621,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7672,7 +7672,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7741,7 +7741,7 @@ exports[`single fields optional data controls shows "add" optional controls when
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -7937,7 +7937,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8035,7 +8035,7 @@ exports[`single fields optional data controls shows "add" optional controls when
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8117,7 +8117,7 @@ exports[`single fields optional data controls shows "add" optional controls when
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8217,7 +8217,7 @@ exports[`single fields optional data controls shows "add" optional controls when
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8351,7 +8351,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8451,7 +8451,7 @@ exports[`single fields optional data controls shows "add" optional controls when
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8502,7 +8502,7 @@ exports[`single fields optional data controls shows "add" optional controls when
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-undefined"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8572,7 +8572,7 @@ exports[`single fields password field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8616,7 +8616,7 @@ exports[`single fields radio field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8698,7 +8698,7 @@ exports[`single fields radio widget with description in schema and FieldTemplate
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8793,7 +8793,7 @@ exports[`single fields schema examples 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -8857,7 +8857,7 @@ exports[`single fields select field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9353,7 +9353,7 @@ exports[`single fields select field single choice enumDisabled 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9444,7 +9444,7 @@ exports[`single fields select field single choice enumDisabled using radio widge
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9527,7 +9527,7 @@ exports[`single fields select field single choice form disabled using radio widg
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9612,7 +9612,7 @@ exports[`single fields select field single choice formData 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9704,7 +9704,7 @@ exports[`single fields select field single choice uiSchema disabled using radio
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9788,7 +9788,7 @@ exports[`single fields select widget with description in schema and FieldTemplat
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-boolean"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9892,7 +9892,7 @@ exports[`single fields slider field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-integer"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-integer"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -9944,7 +9944,7 @@ exports[`single fields string field field with markdown help and description 1`]
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10018,7 +10018,7 @@ exports[`single fields string field field with markdown help text 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10092,7 +10092,7 @@ exports[`single fields string field field with markdown help text without enabli
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10155,7 +10155,7 @@ exports[`single fields string field format data-url 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10201,7 +10201,7 @@ exports[`single fields string field format email 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10245,7 +10245,7 @@ exports[`single fields string field format uri 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10289,7 +10289,7 @@ exports[`single fields string field regular 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10333,7 +10333,7 @@ exports[`single fields string field required field with markdown help 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10402,7 +10402,7 @@ exports[`single fields string field with placeholder 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10446,7 +10446,7 @@ exports[`single fields textarea field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10518,7 +10518,7 @@ exports[`single fields title field 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10568,7 +10568,7 @@ exports[`single fields unsupported field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-undefined"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-undefined"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10615,7 +10615,7 @@ exports[`single fields up/down field 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-number"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -10659,7 +10659,7 @@ exports[`single fields using custom tagName 1`] = `
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-string"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
diff --git a/packages/fluentui-rc/test/__snapshots__/Grid.test.tsx.snap b/packages/fluentui-rc/test/__snapshots__/Grid.test.tsx.snap
index f95ba27c2e..a064a98024 100644
--- a/packages/fluentui-rc/test/__snapshots__/Grid.test.tsx.snap
+++ b/packages/fluentui-rc/test/__snapshots__/Grid.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -85,7 +85,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 5 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -116,7 +116,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 9 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -154,7 +154,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 3 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -390,7 +390,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                 >
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -426,7 +426,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -455,7 +455,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -492,7 +492,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   <div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -575,7 +575,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -620,7 +620,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div
               style="padding: 3px 0px;"
             >
-              <div>
+              <div
+                class="___r7kt3y0_0000000 fqerorx undefined"
+              >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
                 >
@@ -709,7 +711,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -745,7 +747,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -775,7 +777,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -811,7 +813,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               </div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -958,7 +960,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -996,7 +998,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 5 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1027,7 +1029,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 9 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1065,7 +1067,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 3 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1301,7 +1303,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                 >
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1337,7 +1339,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1366,7 +1368,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1403,7 +1405,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   <div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1486,7 +1488,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1531,7 +1533,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div
               style="padding: 3px 0px;"
             >
-              <div>
+              <div
+                class="___r7kt3y0_0000000 fqerorx undefined"
+              >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
                 >
@@ -1620,7 +1624,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1649,7 +1653,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1685,7 +1689,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1715,7 +1719,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1751,7 +1755,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               </div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1898,7 +1902,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1936,7 +1940,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 5 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1967,7 +1971,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 9 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2005,7 +2009,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 3 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2241,7 +2245,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                 >
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2277,7 +2281,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2306,7 +2310,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2343,7 +2347,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   <div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2426,7 +2430,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2471,7 +2475,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div
               style="padding: 3px 0px;"
             >
-              <div>
+              <div
+                class="___r7kt3y0_0000000 fqerorx undefined"
+              >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
                 >
@@ -2560,7 +2566,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2658,7 +2664,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2696,7 +2702,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 5 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2727,7 +2733,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 2 / auto; grid-column: 9 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2765,7 +2771,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             style="grid-row: 3 / auto; grid-column: 1 / span 4;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3001,7 +3007,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                 >
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3037,7 +3043,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3066,7 +3072,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   </div>
                   <div>
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3103,7 +3109,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                   <div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3186,7 +3192,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
                     </div>
                     <div>
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3231,7 +3237,9 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div
               style="padding: 3px 0px;"
             >
-              <div>
+              <div
+                class="___r7kt3y0_0000000 fqerorx undefined"
+              >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
                 >
@@ -3320,7 +3328,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3356,7 +3364,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             </div>
             <div>
               <div
-                class="rjsf-field rjsf-field-string"
+                class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
               >
                 <div
                   class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3386,7 +3394,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
             <div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3422,7 +3430,7 @@ exports[`Complex grid renders person and address and employment in a complex gri
               </div>
               <div>
                 <div
-                  class="rjsf-field rjsf-field-string"
+                  class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                 >
                   <div
                     class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3569,7 +3577,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3607,7 +3615,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3638,7 +3646,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3676,7 +3684,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3893,7 +3901,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3931,7 +3939,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3962,7 +3970,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4000,7 +4008,7 @@ exports[`Three even column grid renders person and address in three columns, no
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4148,7 +4156,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4186,7 +4194,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4217,7 +4225,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4255,7 +4263,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4472,7 +4480,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4510,7 +4518,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4541,7 +4549,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -4579,7 +4587,7 @@ exports[`Two even column grid renders person and address in two columns, no empl
             style="grid-row: auto / auto; grid-column: auto / auto;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
diff --git a/packages/fluentui-rc/test/__snapshots__/Object.test.tsx.snap b/packages/fluentui-rc/test/__snapshots__/Object.test.tsx.snap
index f9998d9e84..0deed85f54 100644
--- a/packages/fluentui-rc/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/fluentui-rc/test/__snapshots__/Object.test.tsx.snap
@@ -48,7 +48,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -109,7 +109,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -141,7 +141,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -173,7 +173,7 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -244,7 +244,7 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -423,7 +423,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -455,7 +455,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -488,7 +488,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-boolean"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-boolean"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -563,13 +563,13 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -578,7 +578,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_0"
                           >
-                            tags-0
+                            tags-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -605,7 +605,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -686,13 +686,13 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -701,7 +701,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_tags_1"
                           >
-                            tags-1
+                            tags-2
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -728,7 +728,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -877,7 +877,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -909,7 +909,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -941,7 +941,7 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1034,7 +1034,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                     style="margin-bottom: 10px;"
                   >
                     <div
-                      class="rjsf-field rjsf-field-string"
+                      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                     >
                       <div
                         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1095,7 +1095,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1127,7 +1127,7 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                             style="margin-bottom: 10px;"
                           >
                             <div
-                              class="rjsf-field rjsf-field-string"
+                              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                             >
                               <div
                                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1198,7 +1198,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1230,7 +1230,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1288,13 +1288,13 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                   class="fui-Flex ___7chxox0_17y04c0 f22iagw f1vx9l62 f4akndk fe5j3v"
                 >
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1303,7 +1303,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_items_0"
                           >
-                            items-0
+                            items-1
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -1330,7 +1330,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___7dg0yg0_z1vqji0 f1bg9a2p f1jj8ep1 f15xbau f4ikngz fy0fskl f1s2aq7o fdrzuqr f15x8b5r f1falr9n f12mpcsy f1gwvigk f1jnshp0 f18rmfxp fvgxktp fphbwmw f19vpps7 fv5swzo f1al02dq f1t6o4dc f10ztigi f1ft5sdu f12zbtn2 f1gzf82w fcvwxyo f8w4c43 f1ol4fw6 f1q1lw4e f1dwjv2g f4lkoma fg455y9 f1rvyvqg f1cwzwz f14g86mu f1dcs8yz fuigjrg fjwq6ea f1lr3nhc fn5gmvv f1mbxvi6 f1vmkb5g f53ppgq f1663y11 f18v5270 f80fkiy f1kc2mi9 f4dhi0o f1y0svfh fihuait fnxhupq fx507ft fyd6l6x fb3rf2x fequ9m0 f18ktai2 fwbmr0d f44c6la"
@@ -1411,13 +1411,13 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     </div>
                   </div>
                   <div
-                    class="fui-Flex ___14l2n00_8jr2f20 f22iagw fgs5rwf"
+                    class="fui-Flex ___1o959zg_1w65b81 f22iagw f6jr5hl"
                   >
                     <div
                       class="fui-Flex ___9stze40_16wdn2w f22iagw fly5x3f f1l02sjl fzy362"
                     >
                       <div
-                        class="rjsf-field rjsf-field-string"
+                        class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
                       >
                         <div
                           class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1426,7 +1426,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                             class="fui-Label ___zkh2gz0_1ef3qts fk6fouc f19n0e5 fkhj508 f1i3iumi fq1loh5 futqtb8 f14rdt9"
                             for="root_items_1"
                           >
-                            items-1
+                            items-2
                             <span
                               aria-hidden="true"
                               class="fui-Label__required ___di7pjm0_79xo450 f1whyuy6 fruq291"
@@ -1453,7 +1453,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     </div>
                     <div
                       class="fui-Flex ___1gzszts_10anl4a f22iagw"
-                      style="margin-left: 8px;"
+                      style="margin-left: 8px; margin-top: 26px;"
                     >
                       <button
                         class="fui-Button r1alrhcs rjsf-array-item-move-up ___1j82qye_10z14xp f18ktai2 fwbmr0d f44c6la"
@@ -1602,7 +1602,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1634,7 +1634,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1666,7 +1666,7 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1877,7 +1877,7 @@ exports[`object fields object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1909,7 +1909,7 @@ exports[`object fields object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -1960,7 +1960,7 @@ exports[`object fields show add button and fields if additionalProperties is tru
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2480,7 +2480,7 @@ exports[`object fields with title and description from both object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2523,7 +2523,7 @@ exports[`object fields with title and description from both object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2789,7 +2789,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2832,7 +2832,7 @@ exports[`object fields with title and description from uiSchema object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -2894,7 +2894,7 @@ exports[`object fields with title and description from uiSchema show add button
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3098,7 +3098,7 @@ exports[`object fields with title and description object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3141,7 +3141,7 @@ exports[`object fields with title and description object 1`] = `
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3203,7 +3203,7 @@ exports[`object fields with title and description show add button and fields if
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3526,7 +3526,7 @@ exports[`object fields with title and description with global label off object 1
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-string"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-string"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3552,7 +3552,7 @@ exports[`object fields with title and description with global label off object 1
             style="margin-bottom: 10px;"
           >
             <div
-              class="rjsf-field rjsf-field-number"
+              class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-number"
             >
               <div
                 class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
@@ -3597,7 +3597,7 @@ exports[`object fields with title and description with global label off show add
     class="rjsf"
   >
     <div
-      class="rjsf-field rjsf-field-object"
+      class="___r7kt3y0_0000000 fqerorx rjsf-field rjsf-field-object"
     >
       <div
         class="fui-Field ___keyyzl0_1dbn5sh f13qh94s"
diff --git a/packages/mantine/src/templates/ArrayFieldTitleTemplate.tsx b/packages/mantine/src/templates/ArrayFieldTitleTemplate.tsx
index 0fb9b4ba72..dbfb36ee25 100644
--- a/packages/mantine/src/templates/ArrayFieldTitleTemplate.tsx
+++ b/packages/mantine/src/templates/ArrayFieldTitleTemplate.tsx
@@ -6,7 +6,7 @@ import {
   RJSFSchema,
   StrictRJSFSchema,
 } from '@rjsf/utils';
-import { Title } from '@mantine/core';
+import { Grid, Title } from '@mantine/core';
 
 /** The `ArrayFieldTitleTemplate` component renders a `TitleFieldTemplate` with an `id` derived from
  * the `fieldPathId`.
@@ -18,16 +18,25 @@ export default function ArrayFieldTitleTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldTitleProps<T, S, F>) {
-  const { fieldPathId, title, uiSchema, registry } = props;
+  const { fieldPathId, title, uiSchema, registry, optionalDataControl } = props;
 
   const options = getUiOptions<T, S, F>(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!title || !displayLabel) {
     return null;
   }
-  return (
+  let heading = title ? (
     <Title id={titleId(fieldPathId)} order={4} fw='normal'>
       {title}
     </Title>
-  );
+  ) : null;
+  if (optionalDataControl) {
+    heading = (
+      <Grid>
+        <Grid.Col span='auto'>{heading}</Grid.Col>
+        <Grid.Col span='content'>{optionalDataControl}</Grid.Col>
+      </Grid>
+    );
+  }
+  return heading;
 }
diff --git a/packages/mantine/src/templates/BaseInputTemplate.tsx b/packages/mantine/src/templates/BaseInputTemplate.tsx
index 9f1aecd707..ed0a49e634 100644
--- a/packages/mantine/src/templates/BaseInputTemplate.tsx
+++ b/packages/mantine/src/templates/BaseInputTemplate.tsx
@@ -47,6 +47,7 @@ export default function BaseInputTemplate<
   } = props;
 
   const inputProps = getInputProps<T, S, F>(schema, type, options, false);
+  const description = hideLabel ? undefined : options.description || schema.description;
   const themeProps = cleanupOptions(options);
 
   const handleNumberChange = useCallback((value: number | string) => onChange(value), [onChange]);
@@ -74,44 +75,40 @@ export default function BaseInputTemplate<
     [onFocus, id],
   );
 
+  const componentProps = {
+    id,
+    name: htmlName || id,
+    label: labelValue(label || undefined, hideLabel, false),
+    required,
+    autoFocus: autofocus,
+    disabled: disabled || readonly,
+    onBlur: !readonly ? handleBlur : undefined,
+    onFocus: !readonly ? handleFocus : undefined,
+    placeholder,
+    error: rawErrors && rawErrors.length > 0 ? rawErrors.join('\n') : undefined,
+    list: schema.examples ? examplesId(id) : undefined,
+  };
+
   const input =
     inputProps.type === 'number' || inputProps.type === 'integer' ? (
       <NumberInput
-        id={id}
-        name={htmlName || id}
-        label={labelValue(label || undefined, hideLabel, false)}
-        required={required}
-        autoFocus={autofocus}
-        disabled={disabled || readonly}
-        onBlur={!readonly ? handleBlur : undefined}
         onChange={!readonly ? handleNumberChange : undefined}
-        onFocus={!readonly ? handleFocus : undefined}
-        placeholder={placeholder}
-        error={rawErrors && rawErrors.length > 0 ? rawErrors.join('\n') : undefined}
-        list={schema.examples ? examplesId(id) : undefined}
+        {...componentProps}
         {...inputProps}
         {...themeProps}
         step={typeof inputProps.step === 'number' ? inputProps.step : 1}
         type='text'
+        description={description}
         value={value}
         aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
       />
     ) : (
       <TextInput
-        id={id}
-        name={htmlName || id}
-        label={labelValue(label || undefined, hideLabel, false)}
-        required={required}
-        autoFocus={autofocus}
-        disabled={disabled || readonly}
-        onBlur={!readonly ? handleBlur : undefined}
         onChange={!readonly ? handleChange : undefined}
-        onFocus={!readonly ? handleFocus : undefined}
-        placeholder={placeholder}
-        error={rawErrors && rawErrors.length > 0 ? rawErrors.join('\n') : undefined}
-        list={schema.examples ? examplesId(id) : undefined}
+        {...componentProps}
         {...inputProps}
         {...themeProps}
+        description={description}
         value={value}
         aria-describedby={ariaDescribedByIds(id, !!schema.examples)}
       />
diff --git a/packages/mantine/src/utils.ts b/packages/mantine/src/utils.ts
index 5190cd21fa..a907f1e11b 100644
--- a/packages/mantine/src/utils.ts
+++ b/packages/mantine/src/utils.ts
@@ -4,6 +4,7 @@ const uiOptionsKeys: Array<keyof UIOptionsType> = [
   'emptyValue',
   'classNames',
   'title',
+  'label',
   'help',
   'autocomplete',
   'disabled',
diff --git a/packages/mantine/test/__snapshots__/Array.test.tsx.snap b/packages/mantine/test/__snapshots__/Array.test.tsx.snap
index a9e5c0fd8b..dca2c9a9cd 100644
--- a/packages/mantine/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/mantine/test/__snapshots__/Array.test.tsx.snap
@@ -1415,7 +1415,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rio"
+              class="m_8bffd616 mantine-Flex-root __m__-rit"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -1434,10 +1434,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-ris{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rj1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-ris"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rj1"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -1697,7 +1697,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rjk"
+              class="m_8bffd616 mantine-Flex-root __m__-rjp"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -1716,10 +1716,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rjo{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rjt{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-rjo"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rjt"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -2075,7 +2075,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rhj"
+              class="m_8bffd616 mantine-Flex-root __m__-rho"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2232,7 +2232,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-ri2"
+              class="m_8bffd616 mantine-Flex-root __m__-ri7"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2568,7 +2568,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes with nameGenerator 1`] =
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rp7:"
+                      id=":rpc:"
                       role="option"
                       value="0"
                     >
@@ -2580,7 +2580,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes with nameGenerator 1`] =
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rp9:"
+                      id=":rpe:"
                       role="option"
                       value="1"
                     >
@@ -2592,7 +2592,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes with nameGenerator 1`] =
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rpb:"
+                      id=":rpg:"
                       role="option"
                       value="2"
                     >
@@ -2682,7 +2682,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rkn"
+              class="m_8bffd616 mantine-Flex-root __m__-rks"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2724,7 +2724,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rkv"
+              class="m_8bffd616 mantine-Flex-root __m__-rl4"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2819,7 +2819,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rl9"
+              class="m_8bffd616 mantine-Flex-root __m__-rle"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2934,7 +2934,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rlm"
+              class="m_8bffd616 mantine-Flex-root __m__-rlr"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -2957,7 +2957,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         style="margin-bottom: var(--mantine-spacing-xs);"
                       >
                         <div
-                          class="m_8bffd616 mantine-Flex-root __m__-rls"
+                          class="m_8bffd616 mantine-Flex-root __m__-rm1"
                           style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                         >
                           <div
@@ -3114,7 +3114,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         style="margin-bottom: var(--mantine-spacing-xs);"
                       >
                         <div
-                          class="m_8bffd616 mantine-Flex-root __m__-rmb"
+                          class="m_8bffd616 mantine-Flex-root __m__-rmg"
                           style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                         >
                           <div
@@ -3435,7 +3435,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rn4"
+              class="m_8bffd616 mantine-Flex-root __m__-rn9"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -3458,7 +3458,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         style="margin-bottom: var(--mantine-spacing-xs);"
                       >
                         <div
-                          class="m_8bffd616 mantine-Flex-root __m__-rna"
+                          class="m_8bffd616 mantine-Flex-root __m__-rnf"
                           style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                         >
                           <div
@@ -3615,7 +3615,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                         style="margin-bottom: var(--mantine-spacing-xs);"
                       >
                         <div
-                          class="m_8bffd616 mantine-Flex-root __m__-rnp"
+                          class="m_8bffd616 mantine-Flex-root __m__-rnu"
                           style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                         >
                           <div
@@ -4032,7 +4032,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rqn"
+              class="m_8bffd616 mantine-Flex-root __m__-rqs"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -4051,10 +4051,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rqr{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rr0{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-rqr"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rr0"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -4314,7 +4314,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rrj"
+              class="m_8bffd616 mantine-Flex-root __m__-rro"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -4333,10 +4333,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rrn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rrs{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-rrn"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rrs"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -4692,7 +4692,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rpi"
+              class="m_8bffd616 mantine-Flex-root __m__-rpn"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -4849,7 +4849,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rq1"
+              class="m_8bffd616 mantine-Flex-root __m__-rq6"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -5235,7 +5235,7 @@ exports[`with title and description array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r6b"
+              class="m_8bffd616 mantine-Flex-root __m__-r6d"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -5257,7 +5257,7 @@ exports[`with title and description array icons 1`] = `
                       id="root_0-label"
                       style="--input-label-size: var(--mantine-font-size-sm);"
                     >
-                      Test item
+                      Test field-1
                       <span
                         aria-hidden="true"
                         class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -5265,13 +5265,22 @@ exports[`with title and description array icons 1`] = `
                          *
                       </span>
                     </label>
+                    <p
+                      class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                      data-size="sm"
+                      id="root_0-description"
+                      style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                    >
+                      a test item description
+                    </p>
                     <div
                       class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                       data-size="sm"
                       data-variant="default"
-                      style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                      style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                     >
                       <input
+                        aria-describedby="root_0-description"
                         aria-invalid="false"
                         class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                         data-variant="default"
@@ -5446,7 +5455,7 @@ exports[`with title and description array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r6t"
+              class="m_8bffd616 mantine-Flex-root __m__-r70"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -5468,7 +5477,7 @@ exports[`with title and description array icons 1`] = `
                       id="root_1-label"
                       style="--input-label-size: var(--mantine-font-size-sm);"
                     >
-                      Test item
+                      Test field-2
                       <span
                         aria-hidden="true"
                         class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -5476,13 +5485,22 @@ exports[`with title and description array icons 1`] = `
                          *
                       </span>
                     </label>
+                    <p
+                      class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                      data-size="sm"
+                      id="root_1-description"
+                      style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                    >
+                      a test item description
+                    </p>
                     <div
                       class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                       data-size="sm"
                       data-variant="default"
-                      style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                      style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                     >
                       <input
+                        aria-describedby="root_1-description"
                         aria-invalid="false"
                         class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                         data-variant="default"
@@ -5846,7 +5864,7 @@ exports[`with title and description checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r5u:"
+                      id=":r60:"
                       role="option"
                       value="0"
                     >
@@ -5858,7 +5876,7 @@ exports[`with title and description checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r60:"
+                      id=":r62:"
                       role="option"
                       value="1"
                     >
@@ -5870,7 +5888,7 @@ exports[`with title and description checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r62:"
+                      id=":r64:"
                       role="option"
                       value="2"
                     >
@@ -6001,7 +6019,7 @@ exports[`with title and description fixed array 1`] = `
                       id="root_0-label"
                       style="--input-label-size: var(--mantine-font-size-sm);"
                     >
-                      Test item
+                      Test field-1
                       <span
                         aria-hidden="true"
                         class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -6009,13 +6027,22 @@ exports[`with title and description fixed array 1`] = `
                          *
                       </span>
                     </label>
+                    <p
+                      class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                      data-size="sm"
+                      id="root_0-description"
+                      style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                    >
+                      a test item description
+                    </p>
                     <div
                       class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                       data-size="sm"
                       data-variant="default"
-                      style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                      style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                     >
                       <input
+                        aria-describedby="root_0-description"
                         aria-invalid="false"
                         class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                         data-variant="default"
@@ -6036,7 +6063,7 @@ exports[`with title and description fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r50"
+              class="m_8bffd616 mantine-Flex-root __m__-r51"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -6058,7 +6085,7 @@ exports[`with title and description fixed array 1`] = `
                       id="root_1-label"
                       style="--input-label-size: var(--mantine-font-size-sm);"
                     >
-                      Test item
+                      Test field-2
                       <span
                         aria-hidden="true"
                         class="m_78a94662 mantine-InputWrapper-required mantine-NumberInput-required"
@@ -6066,14 +6093,23 @@ exports[`with title and description fixed array 1`] = `
                          *
                       </span>
                     </label>
+                    <p
+                      class="m_fe47ce59 mantine-InputWrapper-description mantine-NumberInput-description"
+                      data-size="sm"
+                      id="root_1-description"
+                      style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                    >
+                      a test item description
+                    </p>
                     <div
                       class="m_6c018570 mantine-Input-wrapper mantine-NumberInput-wrapper"
                       data-size="sm"
                       data-variant="default"
                       data-with-right-section="true"
-                      style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm); --input-right-section-width: var(--ni-right-section-width-sm);"
+                      style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm); --input-right-section-width: var(--ni-right-section-width-sm);"
                     >
                       <input
+                        aria-describedby="root_1-description"
                         aria-invalid="false"
                         class="m_8fb7ebe7 mantine-Input-input mantine-NumberInput-input"
                         data-variant="default"
@@ -6333,7 +6369,7 @@ exports[`with title and description from both array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rd7"
+              class="m_8bffd616 mantine-Flex-root __m__-rdb"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -6553,7 +6589,7 @@ exports[`with title and description from both array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rdq"
+              class="m_8bffd616 mantine-Flex-root __m__-rdu"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -6971,7 +7007,7 @@ exports[`with title and description from both checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rcq:"
+                      id=":rcu:"
                       role="option"
                       value="0"
                     >
@@ -6983,7 +7019,7 @@ exports[`with title and description from both checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rcs:"
+                      id=":rd0:"
                       role="option"
                       value="1"
                     >
@@ -6995,7 +7031,7 @@ exports[`with title and description from both checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rcu:"
+                      id=":rd2:"
                       role="option"
                       value="2"
                     >
@@ -7104,7 +7140,7 @@ exports[`with title and description from both fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rbg"
+              class="m_8bffd616 mantine-Flex-root __m__-rbk"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -7170,7 +7206,7 @@ exports[`with title and description from both fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rbq"
+              class="m_8bffd616 mantine-Flex-root __m__-rbu"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -7476,7 +7512,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r9o"
+              class="m_8bffd616 mantine-Flex-root __m__-r9s"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -7696,7 +7732,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rab"
+              class="m_8bffd616 mantine-Flex-root __m__-raf"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -8114,7 +8150,7 @@ exports[`with title and description from uiSchema checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9b:"
+                      id=":r9f:"
                       role="option"
                       value="0"
                     >
@@ -8126,7 +8162,7 @@ exports[`with title and description from uiSchema checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9d:"
+                      id=":r9h:"
                       role="option"
                       value="1"
                     >
@@ -8138,7 +8174,7 @@ exports[`with title and description from uiSchema checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9f:"
+                      id=":r9j:"
                       role="option"
                       value="2"
                     >
@@ -8247,7 +8283,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r81"
+              class="m_8bffd616 mantine-Flex-root __m__-r85"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -8313,7 +8349,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-r8b"
+              class="m_8bffd616 mantine-Flex-root __m__-r8f"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -8587,7 +8623,7 @@ exports[`with title and description with global label off array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rga"
+              class="m_8bffd616 mantine-Flex-root __m__-rgf"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -8782,7 +8818,7 @@ exports[`with title and description with global label off array icons 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rgr"
+              class="m_8bffd616 mantine-Flex-root __m__-rh0"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -9064,6 +9100,15 @@ exports[`with title and description with global label off checkboxes 1`] = `
         class="m_46b77525 mantine-InputWrapper-root mantine-MultiSelect-root"
         data-size="sm"
       >
+        <label
+          class="m_8fdc1311 mantine-InputWrapper-label mantine-MultiSelect-label"
+          data-size="sm"
+          for="root"
+          id="root-label"
+          style="--input-label-size: var(--mantine-font-size-sm);"
+        >
+          Test field
+        </label>
         <div
           class="m_6c018570 mantine-Input-wrapper mantine-MultiSelect-wrapper"
           data-multiline="true"
@@ -9126,6 +9171,7 @@ exports[`with title and description with global label off checkboxes 1`] = `
         style="display: none; z-index: 300; top: 0px; left: 0px; --combobox-option-fz: var(--mantine-font-size-sm); --combobox-option-padding: var(--combobox-option-padding-sm);"
       >
         <div
+          aria-labelledby="root-label"
           class="m_b2821a6e mantine-MultiSelect-options"
           id="mantine-i"
           role="listbox"
@@ -9157,7 +9203,7 @@ exports[`with title and description with global label off checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rfv:"
+                      id=":rg4:"
                       role="option"
                       value="0"
                     >
@@ -9169,7 +9215,7 @@ exports[`with title and description with global label off checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rg1:"
+                      id=":rg6:"
                       role="option"
                       value="1"
                     >
@@ -9181,7 +9227,7 @@ exports[`with title and description with global label off checkboxes 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rg3:"
+                      id=":rg8:"
                       role="option"
                       value="2"
                     >
@@ -9274,7 +9320,7 @@ exports[`with title and description with global label off fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rer"
+              class="m_8bffd616 mantine-Flex-root __m__-rev"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
@@ -9315,7 +9361,7 @@ exports[`with title and description with global label off fixed array 1`] = `
             style="margin-bottom: var(--mantine-spacing-xs);"
           >
             <div
-              class="m_8bffd616 mantine-Flex-root __m__-rf3"
+              class="m_8bffd616 mantine-Flex-root __m__-rf7"
               style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
             >
               <div
diff --git a/packages/mantine/test/__snapshots__/Form.test.tsx.snap b/packages/mantine/test/__snapshots__/Form.test.tsx.snap
index 03d89a04e8..9c84967919 100644
--- a/packages/mantine/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/mantine/test/__snapshots__/Form.test.tsx.snap
@@ -31,10 +31,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1cc{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1dp{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1cc"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1dp"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -68,7 +68,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1cj"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1e0"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -95,10 +95,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-r1co{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                              .__m__-r1e5{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                             </style>
                             <div
-                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1co"
+                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1e5"
                               style="margin-bottom: var(--mantine-spacing-sm);"
                             >
                               <div
@@ -321,7 +321,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1df"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1es"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -348,10 +348,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-r1dk{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                              .__m__-r1f1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                             </style>
                             <div
-                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1dk"
+                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1f1"
                               style="margin-bottom: var(--mantine-spacing-sm);"
                             >
                               <div
@@ -672,10 +672,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1b0{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1cd{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1b0"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1cd"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -709,7 +709,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1b7"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1ck"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -731,7 +731,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               id="root_tags_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-0
+                              tags-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -882,7 +882,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1bn"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1d4"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -904,7 +904,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               id="root_tags_1-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-1
+                              tags-2
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -1151,10 +1151,10 @@ exports[`nameGenerator bracketNameGenerator checkboxes field 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1g4{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1hh{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1g4"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1hh"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1178,7 +1178,7 @@ exports[`nameGenerator bracketNameGenerator checkboxes field 1`] = `
                   role="group"
                 >
                   <div
-                    class="m_8bffd616 mantine-Flex-root __m__-r1ga"
+                    class="m_8bffd616 mantine-Flex-root __m__-r1hn"
                     style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
                   >
                     <div
@@ -1381,10 +1381,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r19p{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1b6{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r19p"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1b6"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1410,10 +1410,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r19u{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r1bb{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r19u"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r1bb"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -1515,10 +1515,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r1af{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r1bs{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r1af"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r1bs"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -1659,10 +1659,10 @@ exports[`nameGenerator bracketNameGenerator radio field 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1fc{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1gp{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1fc"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1gp"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1686,7 +1686,7 @@ exports[`nameGenerator bracketNameGenerator radio field 1`] = `
                   role="radiogroup"
                 >
                   <div
-                    class="m_8bffd616 mantine-Flex-root __m__-r1fj"
+                    class="m_8bffd616 mantine-Flex-root __m__-r1h0"
                     style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
                   >
                     <div
@@ -1840,10 +1840,10 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1eg{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1ft{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1eg"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1ft"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1943,7 +1943,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1f3:"
+                              id=":r1gg:"
                               role="option"
                               value="0"
                             >
@@ -1955,7 +1955,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1f5:"
+                              id=":r1gi:"
                               role="option"
                               value="1"
                             >
@@ -1967,7 +1967,7 @@ exports[`nameGenerator bracketNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1f7:"
+                              id=":r1gk:"
                               role="option"
                               value="2"
                             >
@@ -2057,10 +2057,10 @@ exports[`nameGenerator bracketNameGenerator simple fields 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r18v{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1ac{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r18v"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1ac"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -2302,10 +2302,10 @@ exports[`nameGenerator bracketNameGenerator textarea field 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1h1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1ie{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1h1"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1ie"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -2399,10 +2399,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1kp{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1m6{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1kp"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1m6"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -2436,7 +2436,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1l0"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1md"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -2463,10 +2463,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-r1l5{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                              .__m__-r1mi{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                             </style>
                             <div
-                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1l5"
+                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1mi"
                               style="margin-bottom: var(--mantine-spacing-sm);"
                             >
                               <div
@@ -2689,7 +2689,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1ls"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1n9"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -2716,10 +2716,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-r1m1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                              .__m__-r1ne{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                             </style>
                             <div
-                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1m1"
+                              class="m_2415a157 mantine-SimpleGrid-root __m__-r1ne"
                               style="margin-bottom: var(--mantine-spacing-sm);"
                             >
                               <div
@@ -3040,10 +3040,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1jd{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1kq{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1jd"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1kq"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3077,7 +3077,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1jk"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1l1"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -3099,7 +3099,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               id="root_tags_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-0
+                              tags-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -3250,7 +3250,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r1k4"
+                      class="m_8bffd616 mantine-Flex-root __m__-r1lh"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -3272,7 +3272,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               id="root_tags_1-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-1
+                              tags-2
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -3519,10 +3519,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1i6{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1jj{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1i6"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1jj"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3548,10 +3548,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r1ib{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r1jo{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r1ib"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r1jo"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -3653,10 +3653,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r1is{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r1k9{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r1is"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r1k9"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -3797,10 +3797,10 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1mt{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1oa{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1mt"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1oa"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3900,7 +3900,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1ng:"
+                              id=":r1ot:"
                               role="option"
                               value="0"
                             >
@@ -3912,7 +3912,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1ni:"
+                              id=":r1ov:"
                               role="option"
                               value="1"
                             >
@@ -3924,7 +3924,7 @@ exports[`nameGenerator dotNotationNameGenerator select field with enum 1`] = `
                               aria-selected="false"
                               class="m_92253aa5 mantine-Select-option m_390b5f4"
                               data-combobox-option="true"
-                              id=":r1nk:"
+                              id=":r1p1:"
                               role="option"
                               value="2"
                             >
@@ -4014,10 +4014,10 @@ exports[`nameGenerator dotNotationNameGenerator simple fields 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r1hc{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r1ip{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r1hc"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r1ip"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -4737,7 +4737,7 @@ exports[`single fields checkboxes field 1`] = `
           role="group"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-rgn"
+            class="m_8bffd616 mantine-Flex-root __m__-rgq"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -4989,7 +4989,7 @@ exports[`single fields checkboxes widget with custom options and labels 1`] = `
           role="group"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-ras"
+            class="m_8bffd616 mantine-Flex-root __m__-rav"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: row; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -5204,7 +5204,7 @@ exports[`single fields checkboxes widget with required field 1`] = `
           role="group"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-rbm"
+            class="m_8bffd616 mantine-Flex-root __m__-rbp"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -5403,10 +5403,10 @@ exports[`single fields field with description 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rij{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rim{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rij"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rim"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5428,13 +5428,22 @@ exports[`single fields field with description 1`] = `
                 >
                   my-field
                 </label>
+                <p
+                  class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                  data-size="sm"
+                  id="root_my-field-description"
+                  style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                >
+                  some description
+                </p>
                 <div
                   class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                   data-size="sm"
                   data-variant="default"
-                  style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                  style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                 >
                   <input
+                    aria-describedby="root_my-field-description"
                     aria-invalid="false"
                     class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                     data-variant="default"
@@ -5501,10 +5510,10 @@ exports[`single fields field with description in uiSchema 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-riu{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rj2{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-riu"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rj2"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5608,10 +5617,10 @@ exports[`single fields field with markdown description 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rja{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rje{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rja"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rje"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5633,13 +5642,22 @@ exports[`single fields field with markdown description 1`] = `
                 >
                   my-field
                 </label>
+                <p
+                  class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                  data-size="sm"
+                  id="root_my-field-description"
+                  style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                >
+                  some **Rich** description
+                </p>
                 <div
                   class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                   data-size="sm"
                   data-variant="default"
-                  style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                  style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                 >
                   <input
+                    aria-describedby="root_my-field-description"
                     aria-invalid="false"
                     class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                     data-variant="default"
@@ -5706,10 +5724,10 @@ exports[`single fields field with markdown description in uiSchema 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rjl{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rjq{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rjl"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rjq"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -6294,10 +6312,10 @@ exports[`single fields hidden field 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rie{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rih{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rie"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rih"
           style="margin-bottom: var(--mantine-spacing-sm);"
         />
       </div>
@@ -6703,10 +6721,10 @@ exports[`single fields optional data controls does not show optional controls wh
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rlg{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rll{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rlg"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rll"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -6732,10 +6750,10 @@ exports[`single fields optional data controls does not show optional controls wh
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rll{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rlq{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rll"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rlq"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -6799,10 +6817,10 @@ exports[`single fields optional data controls does not show optional controls wh
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rm0{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-rm5{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-rm0"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-rm5"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -6870,10 +6888,10 @@ exports[`single fields optional data controls does not show optional controls wh
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rmb{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-rmg{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-rmb"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-rmg"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -7233,10 +7251,10 @@ exports[`single fields optional data controls does not show optional controls wh
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rni{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rnn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rni"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rnn"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -7455,7 +7473,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 data-checked="true"
                                 data-combobox-active="true"
                                 data-combobox-option="true"
-                                id=":roj:"
+                                id=":roo:"
                                 role="option"
                                 value="0"
                               >
@@ -7481,7 +7499,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":rol:"
+                                id=":roq:"
                                 role="option"
                                 value="1"
                               >
@@ -7493,7 +7511,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":ron:"
+                                id=":ros:"
                                 role="option"
                                 value="2"
                               >
@@ -7547,10 +7565,10 @@ exports[`single fields optional data controls does not show optional controls wh
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-ror{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rp0{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-ror"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rp0"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -7702,7 +7720,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 data-checked="true"
                                 data-combobox-active="true"
                                 data-combobox-option="true"
-                                id=":rpl:"
+                                id=":rpq:"
                                 role="option"
                                 value="0"
                               >
@@ -7728,7 +7746,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":rpn:"
+                                id=":rps:"
                                 role="option"
                                 value="1"
                               >
@@ -7740,7 +7758,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":rpp:"
+                                id=":rpu:"
                                 role="option"
                                 value="2"
                               >
@@ -7907,10 +7925,10 @@ exports[`single fields optional data controls does not show optional controls wh
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rvs{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r119{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rvs"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r119"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -7936,10 +7954,10 @@ exports[`single fields optional data controls does not show optional controls wh
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r101{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r11e{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r101"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r11e"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -8006,10 +8024,10 @@ exports[`single fields optional data controls does not show optional controls wh
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r10c{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r11p{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r10c"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r11p"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -8080,10 +8098,10 @@ exports[`single fields optional data controls does not show optional controls wh
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r10n{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r124{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r10n"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r124"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -8454,10 +8472,10 @@ exports[`single fields optional data controls does not show optional controls wh
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r11u{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r13b{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r11u"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r13b"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -8685,7 +8703,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 data-checked="true"
                                 data-combobox-active="true"
                                 data-combobox-option="true"
-                                id=":r12v:"
+                                id=":r14c:"
                                 role="option"
                                 value="0"
                               >
@@ -8711,7 +8729,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":r131:"
+                                id=":r14e:"
                                 role="option"
                                 value="1"
                               >
@@ -8723,7 +8741,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":r133:"
+                                id=":r14g:"
                                 role="option"
                                 value="2"
                               >
@@ -8778,10 +8796,10 @@ exports[`single fields optional data controls does not show optional controls wh
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r137{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-r14k{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-r137"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-r14k"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <div
@@ -8937,7 +8955,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 data-checked="true"
                                 data-combobox-active="true"
                                 data-combobox-option="true"
-                                id=":r141:"
+                                id=":r15e:"
                                 role="option"
                                 value="0"
                               >
@@ -8963,7 +8981,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":r143:"
+                                id=":r15g:"
                                 role="option"
                                 value="1"
                               >
@@ -8975,7 +8993,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 aria-selected="false"
                                 class="m_92253aa5 mantine-Select-option m_390b5f4"
                                 data-combobox-option="true"
-                                id=":r145:"
+                                id=":r15i:"
                                 role="option"
                                 value="2"
                               >
@@ -9145,10 +9163,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rs1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rsm{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rs1"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rsm"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -9166,10 +9184,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rs5{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-rsq{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-rs5"
+                  class="m_410352e9 mantine-Grid-root __m__-rsq"
                 >
                   <div
                     class="m_dee7bd2f mantine-Grid-inner"
@@ -9177,10 +9195,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rs7{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                      .__m__-rss{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col __m__-rs7"
+                      class="m_96bdd299 mantine-Grid-col __m__-rss"
                     >
                       <h3
                         class="m_8a5d1357 mantine-Title-root"
@@ -9194,10 +9212,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rsa{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                      .__m__-rsv{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col __m__-rsa"
+                      class="m_96bdd299 mantine-Grid-col __m__-rsv"
                     >
                       <button
                         class="mantine-focus-auto mantine-active rjsf-remove-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
@@ -9243,10 +9261,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rse{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rt3{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rse"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rt3"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -9303,10 +9321,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rso{--grid-gutter:var(--mantine-spacing-md);}
+                          .__m__-rtd{--grid-gutter:var(--mantine-spacing-md);}
                         </style>
                         <div
-                          class="m_410352e9 mantine-Grid-root __m__-rso"
+                          class="m_410352e9 mantine-Grid-root __m__-rtd"
                         >
                           <div
                             class="m_dee7bd2f mantine-Grid-inner"
@@ -9314,10 +9332,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-rsq{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                              .__m__-rtf{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
                             </style>
                             <div
-                              class="m_96bdd299 mantine-Grid-col __m__-rsq"
+                              class="m_96bdd299 mantine-Grid-col __m__-rtf"
                             >
                               <h3
                                 class="m_8a5d1357 mantine-Title-root"
@@ -9331,10 +9349,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             <style
                               data-mantine-styles="inline"
                             >
-                              .__m__-rst{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                              .__m__-rti{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
                             </style>
                             <div
-                              class="m_96bdd299 mantine-Grid-col __m__-rst"
+                              class="m_96bdd299 mantine-Grid-col __m__-rti"
                             >
                               <button
                                 class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
@@ -9380,10 +9398,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rt1{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-rtm{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-rt1"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-rtm"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         />
                       </div>
@@ -9412,10 +9430,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rt6{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-rtr{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-rt6"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-rtr"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -9546,14 +9564,83 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <legend
                           class="m_90794832 mantine-Fieldset-legend"
                         >
-                          <h4
-                            class="m_8a5d1357 mantine-Title-root"
-                            data-order="4"
-                            id="root_nestedObjectOptional_deepArrayOptional2__title"
-                            style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                          <style
+                            data-mantine-styles="inline"
                           >
-                            deepArrayOptional2
-                          </h4>
+                            .__m__-ruc{--grid-gutter:var(--mantine-spacing-md);}
+                          </style>
+                          <div
+                            class="m_410352e9 mantine-Grid-root __m__-ruc"
+                          >
+                            <div
+                              class="m_dee7bd2f mantine-Grid-inner"
+                            >
+                              <style
+                                data-mantine-styles="inline"
+                              >
+                                .__m__-rue{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                              </style>
+                              <div
+                                class="m_96bdd299 mantine-Grid-col __m__-rue"
+                              >
+                                <h4
+                                  class="m_8a5d1357 mantine-Title-root"
+                                  data-order="4"
+                                  id="root_nestedObjectOptional_deepArrayOptional2__title"
+                                  style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                                >
+                                  deepArrayOptional2
+                                </h4>
+                              </div>
+                              <style
+                                data-mantine-styles="inline"
+                              >
+                                .__m__-ruh{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                              </style>
+                              <div
+                                class="m_96bdd299 mantine-Grid-col __m__-ruh"
+                              >
+                                <button
+                                  class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
+                                  data-size="sm"
+                                  data-variant="subtle"
+                                  id="root_nestedObjectOptional_deepArrayOptional2__optionalAdd"
+                                  style="--ai-size: var(--ai-size-sm); --ai-bg: transparent; --ai-hover: var(--mantine-color-blue-light-hover); --ai-color: var(--mantine-color-blue-light-color); --ai-bd: calc(0.0625rem * var(--mantine-scale)) solid transparent;"
+                                  title="Add data for optional field"
+                                  type="button"
+                                >
+                                  <span
+                                    class="m_8d3afb97 mantine-ActionIcon-icon"
+                                  >
+                                    <svg
+                                      class="icon icon-tabler icons-tabler-outline icon-tabler-plus"
+                                      fill="none"
+                                      height="24"
+                                      stroke="currentColor"
+                                      stroke-linecap="round"
+                                      stroke-linejoin="round"
+                                      stroke-width="2"
+                                      viewBox="0 0 24 24"
+                                      width="24"
+                                      xmlns="http://www.w3.org/2000/svg"
+                                    >
+                                      <path
+                                        d="M0 0h24v24H0z"
+                                        fill="none"
+                                        stroke="none"
+                                      />
+                                      <path
+                                        d="M12 5l0 14"
+                                      />
+                                      <path
+                                        d="M5 12l14 0"
+                                      />
+                                    </svg>
+                                  </span>
+                                </button>
+                              </div>
+                            </div>
+                          </div>
                         </legend>
                         <div
                           class="row rjsf-array-item-list"
@@ -9651,14 +9738,83 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <legend
                   class="m_90794832 mantine-Fieldset-legend"
                 >
-                  <h4
-                    class="m_8a5d1357 mantine-Title-root"
-                    data-order="4"
-                    id="root_nestedArrayOptional__title"
-                    style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                  <style
+                    data-mantine-styles="inline"
                   >
-                    nestedArrayOptional
-                  </h4>
+                    .__m__-ruv{--grid-gutter:var(--mantine-spacing-md);}
+                  </style>
+                  <div
+                    class="m_410352e9 mantine-Grid-root __m__-ruv"
+                  >
+                    <div
+                      class="m_dee7bd2f mantine-Grid-inner"
+                    >
+                      <style
+                        data-mantine-styles="inline"
+                      >
+                        .__m__-rv1{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                      </style>
+                      <div
+                        class="m_96bdd299 mantine-Grid-col __m__-rv1"
+                      >
+                        <h4
+                          class="m_8a5d1357 mantine-Title-root"
+                          data-order="4"
+                          id="root_nestedArrayOptional__title"
+                          style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                        >
+                          nestedArrayOptional
+                        </h4>
+                      </div>
+                      <style
+                        data-mantine-styles="inline"
+                      >
+                        .__m__-rv4{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                      </style>
+                      <div
+                        class="m_96bdd299 mantine-Grid-col __m__-rv4"
+                      >
+                        <button
+                          class="mantine-focus-auto mantine-active rjsf-remove-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
+                          data-size="sm"
+                          data-variant="subtle"
+                          id="root_nestedArrayOptional__optionalRemove"
+                          style="--ai-size: var(--ai-size-sm); --ai-bg: transparent; --ai-hover: var(--mantine-color-red-light-hover); --ai-color: var(--mantine-color-red-light-color); --ai-bd: calc(0.0625rem * var(--mantine-scale)) solid transparent;"
+                          title="Remove data for optional field"
+                          type="button"
+                        >
+                          <span
+                            class="m_8d3afb97 mantine-ActionIcon-icon"
+                          >
+                            <svg
+                              class="icon icon-tabler icons-tabler-outline icon-tabler-x"
+                              fill="none"
+                              height="24"
+                              stroke="currentColor"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              stroke-width="2"
+                              viewBox="0 0 24 24"
+                              width="24"
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M0 0h24v24H0z"
+                                fill="none"
+                                stroke="none"
+                              />
+                              <path
+                                d="M18 6l-12 12"
+                              />
+                              <path
+                                d="M6 6l12 12"
+                              />
+                            </svg>
+                          </span>
+                        </button>
+                      </div>
+                    </div>
+                  </div>
                 </legend>
                 <div
                   class="row rjsf-array-item-list"
@@ -9668,7 +9824,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-ru5"
+                      class="m_8bffd616 mantine-Flex-root __m__-rva"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -9690,7 +9846,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               id="root_nestedArrayOptional_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              nestedArrayOptional-0
+                              nestedArrayOptional-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -9834,10 +9990,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rum{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rvr{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rum"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rvr"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -9976,10 +10132,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rv8{--grid-gutter:var(--mantine-spacing-md);}
+                      .__m__-r10d{--grid-gutter:var(--mantine-spacing-md);}
                     </style>
                     <div
-                      class="m_410352e9 mantine-Grid-root __m__-rv8"
+                      class="m_410352e9 mantine-Grid-root __m__-r10d"
                     >
                       <div
                         class="m_dee7bd2f mantine-Grid-inner"
@@ -9987,10 +10143,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rva{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                          .__m__-r10f{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
                         </style>
                         <div
-                          class="m_96bdd299 mantine-Grid-col __m__-rva"
+                          class="m_96bdd299 mantine-Grid-col __m__-r10f"
                         >
                           <h3
                             class="m_8a5d1357 mantine-Title-root"
@@ -10004,10 +10160,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rvd{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                          .__m__-r10i{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
                         </style>
                         <div
-                          class="m_96bdd299 mantine-Grid-col __m__-rvd"
+                          class="m_96bdd299 mantine-Grid-col __m__-r10i"
                         >
                           <button
                             class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
@@ -10053,10 +10209,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rvh{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-r10m{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-rvh"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-r10m"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     />
                   </div>
@@ -10085,14 +10241,83 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <legend
                       class="m_90794832 mantine-Fieldset-legend"
                     >
-                      <h4
-                        class="m_8a5d1357 mantine-Title-root"
-                        data-order="4"
-                        id="root_optionalArrayWithAnyofs__title"
-                        style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                      <style
+                        data-mantine-styles="inline"
                       >
-                        optionalArrayWithAnyofs
-                      </h4>
+                        .__m__-r10r{--grid-gutter:var(--mantine-spacing-md);}
+                      </style>
+                      <div
+                        class="m_410352e9 mantine-Grid-root __m__-r10r"
+                      >
+                        <div
+                          class="m_dee7bd2f mantine-Grid-inner"
+                        >
+                          <style
+                            data-mantine-styles="inline"
+                          >
+                            .__m__-r10t{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                          </style>
+                          <div
+                            class="m_96bdd299 mantine-Grid-col __m__-r10t"
+                          >
+                            <h4
+                              class="m_8a5d1357 mantine-Title-root"
+                              data-order="4"
+                              id="root_optionalArrayWithAnyofs__title"
+                              style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                            >
+                              optionalArrayWithAnyofs
+                            </h4>
+                          </div>
+                          <style
+                            data-mantine-styles="inline"
+                          >
+                            .__m__-r110{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                          </style>
+                          <div
+                            class="m_96bdd299 mantine-Grid-col __m__-r110"
+                          >
+                            <button
+                              class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
+                              data-size="sm"
+                              data-variant="subtle"
+                              id="root_optionalArrayWithAnyofs__optionalAdd"
+                              style="--ai-size: var(--ai-size-sm); --ai-bg: transparent; --ai-hover: var(--mantine-color-blue-light-hover); --ai-color: var(--mantine-color-blue-light-color); --ai-bd: calc(0.0625rem * var(--mantine-scale)) solid transparent;"
+                              title="Add data for optional field"
+                              type="button"
+                            >
+                              <span
+                                class="m_8d3afb97 mantine-ActionIcon-icon"
+                              >
+                                <svg
+                                  class="icon icon-tabler icons-tabler-outline icon-tabler-plus"
+                                  fill="none"
+                                  height="24"
+                                  stroke="currentColor"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round"
+                                  stroke-width="2"
+                                  viewBox="0 0 24 24"
+                                  width="24"
+                                  xmlns="http://www.w3.org/2000/svg"
+                                >
+                                  <path
+                                    d="M0 0h24v24H0z"
+                                    fill="none"
+                                    stroke="none"
+                                  />
+                                  <path
+                                    d="M12 5l0 14"
+                                  />
+                                  <path
+                                    d="M5 12l14 0"
+                                  />
+                                </svg>
+                              </span>
+                            </button>
+                          </div>
+                        </div>
+                      </div>
                     </legend>
                     <div
                       class="row rjsf-array-item-list"
@@ -10164,10 +10389,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r15t{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r17a{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r15t"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r17a"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -10193,10 +10418,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r162{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r17f{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r162"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r17f"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -10264,10 +10489,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r16d{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r17q{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r16d"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r17q"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <em
@@ -10302,10 +10527,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-r16i{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-r17v{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-r16i"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-r17v"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -10571,7 +10796,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-r17h"
+                      class="m_8bffd616 mantine-Flex-root __m__-r18u"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -10593,7 +10818,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               id="root_nestedArrayOptional_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              nestedArrayOptional-0
+                              nestedArrayOptional-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -10744,10 +10969,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r182{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r19f{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r182"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r19f"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -10899,10 +11124,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r18l{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-r1a2{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-r18l"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-r1a2"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <em
@@ -11022,10 +11247,10 @@ exports[`single fields optional data controls shows "add" optional controls when
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rq5{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rqa{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rq5"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rqa"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -11043,10 +11268,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rq9{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-rqe{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-rq9"
+                  class="m_410352e9 mantine-Grid-root __m__-rqe"
                 >
                   <div
                     class="m_dee7bd2f mantine-Grid-inner"
@@ -11054,10 +11279,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rqb{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                      .__m__-rqg{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col __m__-rqb"
+                      class="m_96bdd299 mantine-Grid-col __m__-rqg"
                     >
                       <h3
                         class="m_8a5d1357 mantine-Title-root"
@@ -11071,10 +11296,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rqe{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                      .__m__-rqj{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col __m__-rqe"
+                      class="m_96bdd299 mantine-Grid-col __m__-rqj"
                     >
                       <button
                         class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
@@ -11120,10 +11345,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rqi{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rqn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rqi"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rqn"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 />
               </div>
@@ -11143,14 +11368,83 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <legend
                   class="m_90794832 mantine-Fieldset-legend"
                 >
-                  <h4
-                    class="m_8a5d1357 mantine-Title-root"
-                    data-order="4"
-                    id="root_nestedArrayOptional__title"
-                    style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                  <style
+                    data-mantine-styles="inline"
                   >
-                    nestedArrayOptional
-                  </h4>
+                    .__m__-rqr{--grid-gutter:var(--mantine-spacing-md);}
+                  </style>
+                  <div
+                    class="m_410352e9 mantine-Grid-root __m__-rqr"
+                  >
+                    <div
+                      class="m_dee7bd2f mantine-Grid-inner"
+                    >
+                      <style
+                        data-mantine-styles="inline"
+                      >
+                        .__m__-rqt{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                      </style>
+                      <div
+                        class="m_96bdd299 mantine-Grid-col __m__-rqt"
+                      >
+                        <h4
+                          class="m_8a5d1357 mantine-Title-root"
+                          data-order="4"
+                          id="root_nestedArrayOptional__title"
+                          style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                        >
+                          nestedArrayOptional
+                        </h4>
+                      </div>
+                      <style
+                        data-mantine-styles="inline"
+                      >
+                        .__m__-rr0{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                      </style>
+                      <div
+                        class="m_96bdd299 mantine-Grid-col __m__-rr0"
+                      >
+                        <button
+                          class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
+                          data-size="sm"
+                          data-variant="subtle"
+                          id="root_nestedArrayOptional__optionalAdd"
+                          style="--ai-size: var(--ai-size-sm); --ai-bg: transparent; --ai-hover: var(--mantine-color-blue-light-hover); --ai-color: var(--mantine-color-blue-light-color); --ai-bd: calc(0.0625rem * var(--mantine-scale)) solid transparent;"
+                          title="Add data for optional field"
+                          type="button"
+                        >
+                          <span
+                            class="m_8d3afb97 mantine-ActionIcon-icon"
+                          >
+                            <svg
+                              class="icon icon-tabler icons-tabler-outline icon-tabler-plus"
+                              fill="none"
+                              height="24"
+                              stroke="currentColor"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              stroke-width="2"
+                              viewBox="0 0 24 24"
+                              width="24"
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M0 0h24v24H0z"
+                                fill="none"
+                                stroke="none"
+                              />
+                              <path
+                                d="M12 5l0 14"
+                              />
+                              <path
+                                d="M5 12l14 0"
+                              />
+                            </svg>
+                          </span>
+                        </button>
+                      </div>
+                    </div>
+                  </div>
                 </legend>
                 <div
                   class="row rjsf-array-item-list"
@@ -11181,10 +11475,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rqr{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rr8{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rqr"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rr8"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -11323,10 +11617,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rrd{--grid-gutter:var(--mantine-spacing-md);}
+                      .__m__-rrq{--grid-gutter:var(--mantine-spacing-md);}
                     </style>
                     <div
-                      class="m_410352e9 mantine-Grid-root __m__-rrd"
+                      class="m_410352e9 mantine-Grid-root __m__-rrq"
                     >
                       <div
                         class="m_dee7bd2f mantine-Grid-inner"
@@ -11334,10 +11628,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rrf{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                          .__m__-rrs{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
                         </style>
                         <div
-                          class="m_96bdd299 mantine-Grid-col __m__-rrf"
+                          class="m_96bdd299 mantine-Grid-col __m__-rrs"
                         >
                           <h3
                             class="m_8a5d1357 mantine-Title-root"
@@ -11351,10 +11645,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rri{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                          .__m__-rrv{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
                         </style>
                         <div
-                          class="m_96bdd299 mantine-Grid-col __m__-rri"
+                          class="m_96bdd299 mantine-Grid-col __m__-rrv"
                         >
                           <button
                             class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
@@ -11400,10 +11694,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rrm{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-rs3{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-rrm"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-rs3"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     />
                   </div>
@@ -11432,14 +11726,83 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <legend
                       class="m_90794832 mantine-Fieldset-legend"
                     >
-                      <h4
-                        class="m_8a5d1357 mantine-Title-root"
-                        data-order="4"
-                        id="root_optionalArrayWithAnyofs__title"
-                        style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                      <style
+                        data-mantine-styles="inline"
                       >
-                        optionalArrayWithAnyofs
-                      </h4>
+                        .__m__-rs8{--grid-gutter:var(--mantine-spacing-md);}
+                      </style>
+                      <div
+                        class="m_410352e9 mantine-Grid-root __m__-rs8"
+                      >
+                        <div
+                          class="m_dee7bd2f mantine-Grid-inner"
+                        >
+                          <style
+                            data-mantine-styles="inline"
+                          >
+                            .__m__-rsa{--col-flex-grow:1;--col-flex-basis:0rem;--col-max-width:100%;}
+                          </style>
+                          <div
+                            class="m_96bdd299 mantine-Grid-col __m__-rsa"
+                          >
+                            <h4
+                              class="m_8a5d1357 mantine-Title-root"
+                              data-order="4"
+                              id="root_optionalArrayWithAnyofs__title"
+                              style="--title-fw: var(--mantine-h4-font-weight); --title-lh: var(--mantine-h4-line-height); --title-fz: var(--mantine-h4-font-size); font-weight: normal;"
+                            >
+                              optionalArrayWithAnyofs
+                            </h4>
+                          </div>
+                          <style
+                            data-mantine-styles="inline"
+                          >
+                            .__m__-rsd{--col-flex-grow:auto;--col-flex-basis:auto;--col-width:auto;--col-max-width:unset;}
+                          </style>
+                          <div
+                            class="m_96bdd299 mantine-Grid-col __m__-rsd"
+                          >
+                            <button
+                              class="mantine-focus-auto mantine-active rjsf-add-optional-data m_8d3f4000 mantine-ActionIcon-root m_87cf2631 mantine-UnstyledButton-root"
+                              data-size="sm"
+                              data-variant="subtle"
+                              id="root_optionalArrayWithAnyofs__optionalAdd"
+                              style="--ai-size: var(--ai-size-sm); --ai-bg: transparent; --ai-hover: var(--mantine-color-blue-light-hover); --ai-color: var(--mantine-color-blue-light-color); --ai-bd: calc(0.0625rem * var(--mantine-scale)) solid transparent;"
+                              title="Add data for optional field"
+                              type="button"
+                            >
+                              <span
+                                class="m_8d3afb97 mantine-ActionIcon-icon"
+                              >
+                                <svg
+                                  class="icon icon-tabler icons-tabler-outline icon-tabler-plus"
+                                  fill="none"
+                                  height="24"
+                                  stroke="currentColor"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round"
+                                  stroke-width="2"
+                                  viewBox="0 0 24 24"
+                                  width="24"
+                                  xmlns="http://www.w3.org/2000/svg"
+                                >
+                                  <path
+                                    d="M0 0h24v24H0z"
+                                    fill="none"
+                                    stroke="none"
+                                  />
+                                  <path
+                                    d="M12 5l0 14"
+                                  />
+                                  <path
+                                    d="M5 12l14 0"
+                                  />
+                                </svg>
+                              </span>
+                            </button>
+                          </div>
+                        </div>
+                      </div>
                     </legend>
                     <div
                       class="row rjsf-array-item-list"
@@ -11511,10 +11874,10 @@ exports[`single fields optional data controls shows "add" optional controls when
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r14h{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r15u{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r14h"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r15u"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -11540,10 +11903,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r14m{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r163{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r14m"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r163"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <em
@@ -11613,10 +11976,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r14v{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-r16c{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-r14v"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-r16c"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -11768,10 +12131,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r15i{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                      .__m__-r16v{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                     </style>
                     <div
-                      class="m_2415a157 mantine-SimpleGrid-root __m__-r15i"
+                      class="m_2415a157 mantine-SimpleGrid-root __m__-r16v"
                       style="margin-bottom: var(--mantine-spacing-sm);"
                     >
                       <em
@@ -11984,7 +12347,7 @@ exports[`single fields radio field 1`] = `
           role="radiogroup"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-rhm"
+            class="m_8bffd616 mantine-Flex-root __m__-rhp"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -12140,7 +12503,7 @@ exports[`single fields radio widget with description in schema and FieldTemplate
           role="radiogroup"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-rfe"
+            class="m_8bffd616 mantine-Flex-root __m__-rfh"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -12446,7 +12809,7 @@ exports[`single fields select field 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r4o:"
+                      id=":r4r:"
                       role="option"
                       value="0"
                     >
@@ -12458,7 +12821,7 @@ exports[`single fields select field 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r4q:"
+                      id=":r4t:"
                       role="option"
                       value="1"
                     >
@@ -12631,7 +12994,7 @@ exports[`single fields select field multiple choice 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r5f:"
+                      id=":r5i:"
                       role="option"
                       value="0"
                     >
@@ -12643,7 +13006,7 @@ exports[`single fields select field multiple choice 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r5h:"
+                      id=":r5k:"
                       role="option"
                       value="1"
                     >
@@ -12655,7 +13018,7 @@ exports[`single fields select field multiple choice 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r5j:"
+                      id=":r5m:"
                       role="option"
                       value="2"
                     >
@@ -12667,7 +13030,7 @@ exports[`single fields select field multiple choice 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r5l:"
+                      id=":r5o:"
                       role="option"
                       value="3"
                     >
@@ -12840,7 +13203,7 @@ exports[`single fields select field multiple choice enumDisabled 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9h:"
+                      id=":r9k:"
                       role="option"
                       value="0"
                     >
@@ -12853,7 +13216,7 @@ exports[`single fields select field multiple choice enumDisabled 1`] = `
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-disabled="true"
                       data-combobox-option="true"
-                      id=":r9j:"
+                      id=":r9m:"
                       role="option"
                       value="1"
                     >
@@ -12865,7 +13228,7 @@ exports[`single fields select field multiple choice enumDisabled 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9l:"
+                      id=":r9o:"
                       role="option"
                       value="2"
                     >
@@ -12877,7 +13240,7 @@ exports[`single fields select field multiple choice enumDisabled 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r9n:"
+                      id=":r9q:"
                       role="option"
                       value="3"
                     >
@@ -12963,7 +13326,7 @@ exports[`single fields select field multiple choice enumDisabled using checkboxe
           role="group"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-r9t"
+            class="m_8bffd616 mantine-Flex-root __m__-ra0"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -13369,7 +13732,7 @@ exports[`single fields select field multiple choice formData 1`] = `
                       data-checked="true"
                       data-combobox-active="true"
                       data-combobox-option="true"
-                      id=":rdm:"
+                      id=":rdp:"
                       role="option"
                       value="0"
                     >
@@ -13397,7 +13760,7 @@ exports[`single fields select field multiple choice formData 1`] = `
                       data-checked="true"
                       data-combobox-active="true"
                       data-combobox-option="true"
-                      id=":rdo:"
+                      id=":rdr:"
                       role="option"
                       value="1"
                     >
@@ -13423,7 +13786,7 @@ exports[`single fields select field multiple choice formData 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rdq:"
+                      id=":rdt:"
                       role="option"
                       value="2"
                     >
@@ -13435,7 +13798,7 @@ exports[`single fields select field multiple choice formData 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rds:"
+                      id=":rdv:"
                       role="option"
                       value="3"
                     >
@@ -13608,7 +13971,7 @@ exports[`single fields select field multiple choice with labels 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r6a:"
+                      id=":r6d:"
                       role="option"
                       value="0"
                     >
@@ -13620,7 +13983,7 @@ exports[`single fields select field multiple choice with labels 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r6c:"
+                      id=":r6f:"
                       role="option"
                       value="1"
                     >
@@ -13632,7 +13995,7 @@ exports[`single fields select field multiple choice with labels 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-MultiSelect-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r6e:"
+                      id=":r6h:"
                       role="option"
                       value="2"
                     >
@@ -13790,7 +14153,7 @@ exports[`single fields select field single choice enumDisabled 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":r71:"
+                      id=":r74:"
                       role="option"
                       value="0"
                     >
@@ -13803,7 +14166,7 @@ exports[`single fields select field single choice enumDisabled 1`] = `
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-disabled="true"
                       data-combobox-option="true"
-                      id=":r73:"
+                      id=":r76:"
                       role="option"
                       value="1"
                     >
@@ -13889,7 +14252,7 @@ exports[`single fields select field single choice enumDisabled using radio widge
           role="radiogroup"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-r7a"
+            class="m_8bffd616 mantine-Flex-root __m__-r7d"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -14042,7 +14405,7 @@ exports[`single fields select field single choice form disabled using radio widg
           role="radiogroup"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-r8g"
+            class="m_8bffd616 mantine-Flex-root __m__-r8j"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -14266,7 +14629,7 @@ exports[`single fields select field single choice formData 1`] = `
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rcr:"
+                      id=":rcu:"
                       role="option"
                       value="0"
                     >
@@ -14280,7 +14643,7 @@ exports[`single fields select field single choice formData 1`] = `
                       data-checked="true"
                       data-combobox-active="true"
                       data-combobox-option="true"
-                      id=":rct:"
+                      id=":rd0:"
                       role="option"
                       value="1"
                     >
@@ -14380,7 +14743,7 @@ exports[`single fields select field single choice uiSchema disabled using radio
           role="radiogroup"
         >
           <div
-            class="m_8bffd616 mantine-Flex-root __m__-r7t"
+            class="m_8bffd616 mantine-Flex-root __m__-r80"
             style="gap: var(--mantine-spacing-xs); flex-wrap: wrap; flex-direction: column; margin-top: var(--mantine-spacing-xs);"
           >
             <div
@@ -14611,7 +14974,7 @@ exports[`single fields select widget with description in schema and FieldTemplat
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rge:"
+                      id=":rgh:"
                       role="option"
                       value="0"
                     >
@@ -14623,7 +14986,7 @@ exports[`single fields select widget with description in schema and FieldTemplat
                       aria-selected="false"
                       class="m_92253aa5 mantine-Select-option m_390b5f4"
                       data-combobox-option="true"
-                      id=":rgg:"
+                      id=":rgj:"
                       role="option"
                       value="1"
                     >
@@ -14894,13 +15257,22 @@ exports[`single fields string field field with markdown help text 1`] = `
         >
           Markdown Help Test
         </label>
+        <p
+          class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+          data-size="sm"
+          id="root-description"
+          style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+        >
+          A field with markdown help text
+        </p>
         <div
           class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
           data-size="sm"
           data-variant="default"
-          style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+          style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
         >
           <input
+            aria-describedby="root-description"
             aria-invalid="false"
             class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
             data-variant="default"
@@ -14986,13 +15358,22 @@ exports[`single fields string field field with markdown help text without enabli
         >
           Raw Help Test
         </label>
+        <p
+          class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+          data-size="sm"
+          id="root-description"
+          style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+        >
+          A field with raw help text
+        </p>
         <div
           class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
           data-size="sm"
           data-variant="default"
-          style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+          style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
         >
           <input
+            aria-describedby="root-description"
             aria-invalid="false"
             class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
             data-variant="default"
@@ -15327,13 +15708,22 @@ exports[`single fields string field required field with markdown help 1`] = `
         >
           Required Field with Markdown Help
         </label>
+        <p
+          class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+          data-size="sm"
+          id="root-description"
+          style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+        >
+          A required field with markdown help
+        </p>
         <div
           class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
           data-size="sm"
           data-variant="default"
-          style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+          style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
         >
           <input
+            aria-describedby="root-description"
             aria-invalid="false"
             class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
             data-variant="default"
@@ -15546,10 +15936,10 @@ exports[`single fields title field 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rk2{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rk7{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rk2"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rk7"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
diff --git a/packages/mantine/test/__snapshots__/Object.test.tsx.snap b/packages/mantine/test/__snapshots__/Object.test.tsx.snap
index aa2bb00d9d..84d5eac617 100644
--- a/packages/mantine/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/mantine/test/__snapshots__/Object.test.tsx.snap
@@ -31,10 +31,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rce{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rcg{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rce"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rcg"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -60,10 +60,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rcj{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rcl{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rcj"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rcl"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -127,10 +127,10 @@ exports[`nameGenerator bracketNameGenerator nested object 1`] = `
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-rcu{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-rd0{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-rcu"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-rd0"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -309,10 +309,10 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rdl{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rdn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rdl"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rdn"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -361,16 +361,16 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-rdu"
+                class="m_8bffd616 mantine-Flex-root __m__-re0"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-re0{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-re2{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-re0"
+                  class="m_410352e9 mantine-Grid-root __m__-re2"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -379,10 +379,10 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-re2{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-re4{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-re2"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-re4"
                     >
                       <div
                         class="form-group"
@@ -421,10 +421,10 @@ exports[`nameGenerator bracketNameGenerator object with additionalProperties 1`]
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-re9{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-reb{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-re9"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-reb"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -598,10 +598,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-reo{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-req{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-reo"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-req"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -823,7 +823,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-rfk"
+                      class="m_8bffd616 mantine-Flex-root __m__-rfm"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -845,7 +845,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               id="root_tags_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-0
+                              tags-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -996,7 +996,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-rg4"
+                      class="m_8bffd616 mantine-Flex-root __m__-rg6"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -1018,7 +1018,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               id="root_tags_1-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              tags-1
+                              tags-2
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -1265,10 +1265,10 @@ exports[`nameGenerator bracketNameGenerator simple object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rbl{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rbn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rbl"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rbn"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1493,10 +1493,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rhi{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rhk{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rhi"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rhk"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1522,10 +1522,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rhn{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                  .__m__-rhp{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                 </style>
                 <div
-                  class="m_2415a157 mantine-SimpleGrid-root __m__-rhn"
+                  class="m_2415a157 mantine-SimpleGrid-root __m__-rhp"
                   style="margin-bottom: var(--mantine-spacing-sm);"
                 >
                   <div
@@ -1589,10 +1589,10 @@ exports[`nameGenerator dotNotationNameGenerator nested object 1`] = `
                         <style
                           data-mantine-styles="inline"
                         >
-                          .__m__-ri2{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+                          .__m__-ri4{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
                         </style>
                         <div
-                          class="m_2415a157 mantine-SimpleGrid-root __m__-ri2"
+                          class="m_2415a157 mantine-SimpleGrid-root __m__-ri4"
                           style="margin-bottom: var(--mantine-spacing-sm);"
                         >
                           <div
@@ -1733,10 +1733,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rij{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-ril{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rij"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-ril"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -1901,7 +1901,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-rj8"
+                      class="m_8bffd616 mantine-Flex-root __m__-rja"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -1923,7 +1923,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               id="root_items_0-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              items-0
+                              items-1
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -2074,7 +2074,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                     style="margin-bottom: var(--mantine-spacing-xs);"
                   >
                     <div
-                      class="m_8bffd616 mantine-Flex-root __m__-rjo"
+                      class="m_8bffd616 mantine-Flex-root __m__-rjq"
                       style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
                     >
                       <div
@@ -2096,7 +2096,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               id="root_items_1-label"
                               style="--input-label-size: var(--mantine-font-size-sm);"
                             >
-                              items-1
+                              items-2
                               <span
                                 aria-hidden="true"
                                 class="m_78a94662 mantine-InputWrapper-required mantine-TextInput-required"
@@ -2343,10 +2343,10 @@ exports[`nameGenerator dotNotationNameGenerator simple object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rgp{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rgr{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rgp"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rgr"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3276,10 +3276,10 @@ exports[`object fields with title and description additionalProperties 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r35{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r37{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r35"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r37"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3289,16 +3289,16 @@ exports[`object fields with title and description additionalProperties 1`] = `
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-r38"
+                class="m_8bffd616 mantine-Flex-root __m__-r3a"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r3a{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-r3c{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-r3a"
+                  class="m_410352e9 mantine-Grid-root __m__-r3c"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -3307,10 +3307,10 @@ exports[`object fields with title and description additionalProperties 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r3c{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r3e{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r3c"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r3e"
                     >
                       <div
                         class="form-group"
@@ -3349,10 +3349,10 @@ exports[`object fields with title and description additionalProperties 1`] = `
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r3j{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r3l{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r3j"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r3l"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -3541,10 +3541,10 @@ exports[`object fields with title and description from both additionalProperties
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r8f{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r8h{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r8f"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r8h"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -3554,16 +3554,16 @@ exports[`object fields with title and description from both additionalProperties
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-r8i"
+                class="m_8bffd616 mantine-Flex-root __m__-r8k"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r8k{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-r8m{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-r8k"
+                  class="m_410352e9 mantine-Grid-root __m__-r8m"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -3572,10 +3572,10 @@ exports[`object fields with title and description from both additionalProperties
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r8m{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r8o{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r8m"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r8o"
                     >
                       <div
                         class="form-group"
@@ -3614,10 +3614,10 @@ exports[`object fields with title and description from both additionalProperties
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r8t{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r8v{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r8t"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r8v"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -3806,10 +3806,10 @@ exports[`object fields with title and description from both object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r7o{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r7q{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r7o"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r7q"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -4029,10 +4029,10 @@ exports[`object fields with title and description from uiSchema additionalProper
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r5q{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r5s{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r5q"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r5s"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -4042,16 +4042,16 @@ exports[`object fields with title and description from uiSchema additionalProper
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-r5t"
+                class="m_8bffd616 mantine-Flex-root __m__-r5v"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r5v{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-r61{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-r5v"
+                  class="m_410352e9 mantine-Grid-root __m__-r61"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -4060,10 +4060,10 @@ exports[`object fields with title and description from uiSchema additionalProper
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r61{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r63{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r61"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r63"
                     >
                       <div
                         class="form-group"
@@ -4102,10 +4102,10 @@ exports[`object fields with title and description from uiSchema additionalProper
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r68{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r6a{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r68"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r6a"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -4294,10 +4294,10 @@ exports[`object fields with title and description from uiSchema object 1`] = `
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r53{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r55{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r53"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r55"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -4517,10 +4517,10 @@ exports[`object fields with title and description from uiSchema show add button
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r6p{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r6r{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r6p"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r6r"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -4530,16 +4530,16 @@ exports[`object fields with title and description from uiSchema show add button
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-r6s"
+                class="m_8bffd616 mantine-Flex-root __m__-r6u"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r6u{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-r70{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-r6u"
+                  class="m_410352e9 mantine-Grid-root __m__-r70"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -4548,10 +4548,10 @@ exports[`object fields with title and description from uiSchema show add button
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r70{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r72{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r70"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r72"
                     >
                       <div
                         class="form-group"
@@ -4590,10 +4590,10 @@ exports[`object fields with title and description from uiSchema show add button
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r77{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r79{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r77"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r79"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -4807,13 +4807,22 @@ exports[`object fields with title and description object 1`] = `
                 >
                   A
                 </label>
+                <p
+                  class="m_fe47ce59 mantine-InputWrapper-description mantine-TextInput-description"
+                  data-size="sm"
+                  id="root_a-description"
+                  style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                >
+                  A description
+                </p>
                 <div
                   class="m_6c018570 mantine-Input-wrapper mantine-TextInput-wrapper"
                   data-size="sm"
                   data-variant="default"
-                  style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
+                  style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm);"
                 >
                   <input
+                    aria-describedby="root_a-description"
                     aria-invalid="false"
                     class="m_8fb7ebe7 mantine-Input-input mantine-TextInput-input"
                     data-variant="default"
@@ -4845,14 +4854,23 @@ exports[`object fields with title and description object 1`] = `
                 >
                   B
                 </label>
+                <p
+                  class="m_fe47ce59 mantine-InputWrapper-description mantine-NumberInput-description"
+                  data-size="sm"
+                  id="root_b-description"
+                  style="--input-description-size: calc(var(--mantine-font-size-sm) - calc(0.125rem * var(--mantine-scale)));"
+                >
+                  B description
+                </p>
                 <div
                   class="m_6c018570 mantine-Input-wrapper mantine-NumberInput-wrapper"
                   data-size="sm"
                   data-variant="default"
                   data-with-right-section="true"
-                  style="--input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm); --input-right-section-width: var(--ni-right-section-width-sm);"
+                  style="--input-margin-top: calc(var(--mantine-spacing-xs) / 2); --input-height: var(--input-height-sm); --input-fz: var(--mantine-font-size-sm); --input-right-section-width: var(--ni-right-section-width-sm);"
                 >
                   <input
+                    aria-describedby="root_b-description"
                     aria-invalid="false"
                     class="m_8fb7ebe7 mantine-Input-input mantine-NumberInput-input"
                     data-variant="default"
@@ -4987,10 +5005,10 @@ exports[`object fields with title and description show add button and fields if
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r44{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r46{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r44"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r46"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5000,16 +5018,16 @@ exports[`object fields with title and description show add button and fields if
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-r47"
+                class="m_8bffd616 mantine-Flex-root __m__-r49"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-r49{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-r4b{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-r49"
+                  class="m_410352e9 mantine-Grid-root __m__-r4b"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -5018,10 +5036,10 @@ exports[`object fields with title and description show add button and fields if
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r4b{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r4d{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r4b"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r4d"
                     >
                       <div
                         class="form-group"
@@ -5060,10 +5078,10 @@ exports[`object fields with title and description show add button and fields if
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-r4i{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-r4k{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r4i"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-r4k"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -5237,10 +5255,10 @@ exports[`object fields with title and description with global label off addition
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r9t{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r9v{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r9t"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r9v"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5250,16 +5268,16 @@ exports[`object fields with title and description with global label off addition
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-ra0"
+                class="m_8bffd616 mantine-Flex-root __m__-ra2"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-ra2{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-ra4{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-ra2"
+                  class="m_410352e9 mantine-Grid-root __m__-ra4"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -5268,10 +5286,10 @@ exports[`object fields with title and description with global label off addition
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-ra4{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-ra6{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-ra4"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-ra6"
                     >
                       <div
                         class="form-group"
@@ -5310,10 +5328,10 @@ exports[`object fields with title and description with global label off addition
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rab{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-rad{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rab"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rad"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
@@ -5478,10 +5496,10 @@ exports[`object fields with title and description with global label off object 1
         <style
           data-mantine-styles="inline"
         >
-          .__m__-r9c{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-r9e{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-r9c"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-r9e"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5650,10 +5668,10 @@ exports[`object fields with title and description with global label off show add
         <style
           data-mantine-styles="inline"
         >
-          .__m__-rap{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
+          .__m__-rar{--sg-spacing-x:var(--mantine-spacing-md);--sg-spacing-y:var(--mantine-spacing-md);--sg-cols:1;}
         </style>
         <div
-          class="m_2415a157 mantine-SimpleGrid-root __m__-rap"
+          class="m_2415a157 mantine-SimpleGrid-root __m__-rar"
           style="margin-bottom: var(--mantine-spacing-sm);"
         >
           <div
@@ -5663,16 +5681,16 @@ exports[`object fields with title and description with global label off show add
               class="rjsf-field rjsf-field-string"
             >
               <div
-                class="m_8bffd616 mantine-Flex-root __m__-ras"
+                class="m_8bffd616 mantine-Flex-root __m__-rau"
                 style="gap: var(--mantine-spacing-xs); align-items: end; justify-content: center;"
               >
                 <style
                   data-mantine-styles="inline"
                 >
-                  .__m__-rau{--grid-gutter:var(--mantine-spacing-md);}
+                  .__m__-rb0{--grid-gutter:var(--mantine-spacing-md);}
                 </style>
                 <div
-                  class="m_410352e9 mantine-Grid-root __m__-rau"
+                  class="m_410352e9 mantine-Grid-root __m__-rb0"
                   style="--grid-align: center; width: 100%;"
                 >
                   <div
@@ -5681,10 +5699,10 @@ exports[`object fields with title and description with global label off show add
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rb0{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-rb2{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rb0"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rb2"
                     >
                       <div
                         class="form-group"
@@ -5723,10 +5741,10 @@ exports[`object fields with title and description with global label off show add
                     <style
                       data-mantine-styles="inline"
                     >
-                      .__m__-rb7{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
+                      .__m__-rb9{--col-flex-grow:auto;--col-flex-basis:50%;--col-max-width:50%;}
                     </style>
                     <div
-                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rb7"
+                      class="m_96bdd299 mantine-Grid-col form-additional __m__-rb9"
                     >
                       <div
                         class="m_46b77525 mantine-InputWrapper-root mantine-TextInput-root"
diff --git a/packages/mui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/mui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index 39dfd86b35..78562341b3 100644
--- a/packages/mui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/mui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -20,7 +20,7 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;
+  const { children, buttonsProps, hasDescription, hasToolbar, uiSchema, registry } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -44,7 +44,7 @@ export default function ArrayFieldItemTemplate<
         </Box>
       </Grid>
       {hasToolbar && (
-        <Grid>
+        <Grid sx={{ mt: hasDescription ? -5 : -1.5 }}>
           <ArrayFieldItemButtonsTemplate {...buttonsProps} style={btnStyle} />
         </Grid>
       )}
diff --git a/packages/mui/test/__snapshots__/Array.test.tsx.snap b/packages/mui/test/__snapshots__/Array.test.tsx.snap
index 3e6bdfc7a7..5ebbba8e65 100644
--- a/packages/mui/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/mui/test/__snapshots__/Array.test.tsx.snap
@@ -699,6 +699,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
 .emotion-14 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-15 {
@@ -922,6 +923,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-44 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-45 {
   margin-top: 16px;
 }
@@ -1459,7 +1465,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-43"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-14"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-44"
               >
                 <div
                   class="MuiBox-root emotion-45"
@@ -4859,6 +4865,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
 .emotion-26 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-27 {
@@ -5082,6 +5089,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-64 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-65 {
   margin-top: 16px;
 }
@@ -5729,7 +5741,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-63"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-26"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-64"
               >
                 <div
                   class="MuiBox-root emotion-65"
@@ -6107,6 +6119,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
 .emotion-14 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-15 {
@@ -6330,6 +6343,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-40 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-41 {
   margin-top: 16px;
 }
@@ -6829,7 +6847,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-39"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-14"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-40"
               >
                 <div
                   class="MuiBox-root emotion-41"
@@ -8517,6 +8535,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-23 {
@@ -8740,6 +8759,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-48 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-49 {
   margin-top: 16px;
 }
@@ -9269,7 +9293,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                 class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-47"
                               >
                                 <div
-                                  class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                                  class="MuiGrid-root MuiGrid-direction-xs-row emotion-48"
                                 >
                                   <div
                                     class="MuiBox-root emotion-49"
@@ -9653,7 +9677,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                 class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-47"
                               >
                                 <div
-                                  class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                                  class="MuiGrid-root MuiGrid-direction-xs-row emotion-48"
                                 >
                                   <div
                                     class="MuiBox-root emotion-49"
@@ -9755,7 +9779,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-47"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-48"
               >
                 <div
                   class="MuiBox-root emotion-49"
@@ -10255,6 +10279,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
 .emotion-26 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-27 {
@@ -10478,6 +10503,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-64 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-65 {
   margin-top: 16px;
 }
@@ -11125,7 +11155,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-15:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-63"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-26"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-64"
               >
                 <div
                   class="MuiBox-root emotion-65"
@@ -11503,6 +11533,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
 .emotion-14 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-15 {
@@ -11726,6 +11757,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-40 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-41 {
   margin-top: 16px;
 }
@@ -12225,7 +12261,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-39"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-14"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-40"
               >
                 <div
                   class="MuiBox-root emotion-41"
@@ -13149,6 +13185,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -40px;
 }
 
 .emotion-23 {
@@ -13372,6 +13409,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-56 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-57 {
   margin-top: 16px;
 }
@@ -13668,7 +13710,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                               for="root_0"
                               id="root_0-label"
                             >
-                              Test item
+                              Test field-1
                               <span
                                 aria-hidden="true"
                                 class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-15"
@@ -13697,7 +13739,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                                   class="emotion-19"
                                 >
                                   <span>
-                                    Test item *
+                                    Test field-1 *
                                   </span>
                                 </legend>
                               </fieldset>
@@ -13835,7 +13877,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                               for="root_1"
                               id="root_1-label"
                             >
-                              Test item
+                              Test field-2
                               <span
                                 aria-hidden="true"
                                 class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-15"
@@ -13864,7 +13906,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                                   class="emotion-19"
                                 >
                                   <span>
-                                    Test item *
+                                    Test field-2 *
                                   </span>
                                 </legend>
                               </fieldset>
@@ -13973,7 +14015,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-55"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-56"
               >
                 <div
                   class="MuiBox-root emotion-57"
@@ -15236,7 +15278,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                               for="root_0"
                               id="root_0-label"
                             >
-                              Test item
+                              Test field-1
                               <span
                                 aria-hidden="true"
                                 class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-15"
@@ -15265,7 +15307,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                                   class="emotion-19"
                                 >
                                   <span>
-                                    Test item *
+                                    Test field-1 *
                                   </span>
                                 </legend>
                               </fieldset>
@@ -15322,7 +15364,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                               for="root_1"
                               id="root_1-label"
                             >
-                              Test item
+                              Test field-2
                               <span
                                 aria-hidden="true"
                                 class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-15"
@@ -15352,7 +15394,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
                                   class="emotion-19"
                                 >
                                   <span>
-                                    Test item *
+                                    Test field-2 *
                                   </span>
                                 </legend>
                               </fieldset>
@@ -16273,6 +16315,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -40px;
 }
 
 .emotion-23 {
@@ -16496,6 +16539,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-56 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-57 {
   margin-top: 16px;
 }
@@ -17097,7 +17145,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-55"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-56"
               >
                 <div
                   class="MuiBox-root emotion-57"
@@ -19397,6 +19445,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -40px;
 }
 
 .emotion-23 {
@@ -19620,6 +19669,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-56 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-57 {
   margin-top: 16px;
 }
@@ -20221,7 +20275,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-17:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-55"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-56"
               >
                 <div
                   class="MuiBox-root emotion-57"
@@ -22342,6 +22396,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
 .emotion-14 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -40px;
 }
 
 .emotion-15 {
@@ -22565,6 +22620,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-44 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-45 {
   margin-top: 16px;
 }
@@ -23102,7 +23162,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-11:focus::-ms-input-
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-43"
             >
               <div
-                class="MuiGrid-root MuiGrid-direction-xs-row emotion-14"
+                class="MuiGrid-root MuiGrid-direction-xs-row emotion-44"
               >
                 <div
                   class="MuiBox-root emotion-45"
diff --git a/packages/mui/test/__snapshots__/Form.test.tsx.snap b/packages/mui/test/__snapshots__/Form.test.tsx.snap
index 49deb3bdd3..51ff4154fb 100644
--- a/packages/mui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/mui/test/__snapshots__/Form.test.tsx.snap
@@ -615,6 +615,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
 .emotion-34 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-35 {
@@ -838,6 +839,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-74 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-75 {
   margin-top: 16px;
 }
@@ -1508,7 +1514,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-73"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-34"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-74"
                       >
                         <div
                           class="MuiBox-root emotion-75"
@@ -2041,6 +2047,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-23 {
@@ -2264,6 +2271,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-50 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-51 {
   margin-top: 16px;
 }
@@ -2567,7 +2579,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                       for="root_tags_0"
                                       id="root_tags_0-label"
                                     >
-                                      tags-0
+                                      tags-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-17"
@@ -2596,7 +2608,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                           class="emotion-21"
                                         >
                                           <span>
-                                            tags-0 *
+                                            tags-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -2704,7 +2716,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                       for="root_tags_1"
                                       id="root_tags_1-label"
                                     >
-                                      tags-1
+                                      tags-2
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-17"
@@ -2733,7 +2745,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                           class="emotion-21"
                                         >
                                           <span>
-                                            tags-1 *
+                                            tags-2 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -2812,7 +2824,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-49"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-50"
                       >
                         <div
                           class="MuiBox-root emotion-51"
@@ -7198,6 +7210,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
 .emotion-34 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-35 {
@@ -7421,6 +7434,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-74 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-75 {
   margin-top: 16px;
 }
@@ -8091,7 +8109,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-24:focus::-ms-input-
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-73"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-34"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-74"
                       >
                         <div
                           class="MuiBox-root emotion-75"
@@ -8624,6 +8642,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
 .emotion-22 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-23 {
@@ -8847,6 +8866,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-50 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-51 {
   margin-top: 16px;
 }
@@ -9150,7 +9174,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                       for="root_tags_0"
                                       id="root_tags_0-label"
                                     >
-                                      tags-0
+                                      tags-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-17"
@@ -9179,7 +9203,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                           class="emotion-21"
                                         >
                                           <span>
-                                            tags-0 *
+                                            tags-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -9287,7 +9311,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                       for="root_tags_1"
                                       id="root_tags_1-label"
                                     >
-                                      tags-1
+                                      tags-2
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-17"
@@ -9316,7 +9340,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                                           class="emotion-21"
                                         >
                                           <span>
-                                            tags-1 *
+                                            tags-2 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -9395,7 +9419,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-19:focus::-ms-input-
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-49"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-22"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-50"
                       >
                         <div
                           class="MuiBox-root emotion-51"
@@ -25493,6 +25517,12 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-21:focus::-ms-input-
   color: #d32f2f;
 }
 
+.emotion-110 {
+  min-width: 0;
+  box-sizing: border-box;
+  margin-top: -12px;
+}
+
 .emotion-147 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -26208,7 +26238,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-21:focus::-ms-input-
                                       for="root_nestedArrayOptional_0"
                                       id="root_nestedArrayOptional_0-label"
                                     >
-                                      nestedArrayOptional-0
+                                      nestedArrayOptional-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-105"
@@ -26237,7 +26267,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-21:focus::-ms-input-
                                           class="emotion-23"
                                         >
                                           <span>
-                                            nestedArrayOptional-0 *
+                                            nestedArrayOptional-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -26250,7 +26280,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-21:focus::-ms-input-
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-57"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-110"
                       >
                         <button
                           class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorError MuiIconButton-sizeSmall rjsf-array-item-remove emotion-12"
@@ -27325,6 +27355,12 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-16:focus::-ms-input-
   color: #d32f2f;
 }
 
+.emotion-90 {
+  min-width: 0;
+  box-sizing: border-box;
+  margin-top: -12px;
+}
+
 .emotion-91 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -28033,7 +28069,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-16:focus::-ms-input-
                                       for="root_nestedArrayOptional_0"
                                       id="root_nestedArrayOptional_0-label"
                                     >
-                                      nestedArrayOptional-0
+                                      nestedArrayOptional-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-85"
@@ -28063,7 +28099,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-16:focus::-ms-input-
                                           class="emotion-18"
                                         >
                                           <span>
-                                            nestedArrayOptional-0 *
+                                            nestedArrayOptional-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -28076,7 +28112,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-16:focus::-ms-input-
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-47"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-90"
                       >
                         <button
                           class="MuiButtonBase-root Mui-disabled MuiIconButton-root Mui-disabled MuiIconButton-colorError MuiIconButton-sizeSmall rjsf-array-item-remove emotion-91"
diff --git a/packages/mui/test/__snapshots__/Object.test.tsx.snap b/packages/mui/test/__snapshots__/Object.test.tsx.snap
index 7286a637b3..1774be62e9 100644
--- a/packages/mui/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/mui/test/__snapshots__/Object.test.tsx.snap
@@ -2396,6 +2396,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
 .emotion-45 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-46 {
@@ -2619,6 +2620,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-73 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-74 {
   margin-top: 16px;
 }
@@ -3054,7 +3060,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                       for="root_tags_0"
                                       id="root_tags_0-label"
                                     >
-                                      tags-0
+                                      tags-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-40"
@@ -3083,7 +3089,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                           class="emotion-9"
                                         >
                                           <span>
-                                            tags-0 *
+                                            tags-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -3191,7 +3197,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                       for="root_tags_1"
                                       id="root_tags_1-label"
                                     >
-                                      tags-1
+                                      tags-2
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-40"
@@ -3220,7 +3226,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                           class="emotion-9"
                                         >
                                           <span>
-                                            tags-1 *
+                                            tags-2 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -3299,7 +3305,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-72"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-45"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-73"
                       >
                         <div
                           class="MuiBox-root emotion-74"
@@ -5160,6 +5166,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
 .emotion-38 {
   min-width: 0;
   box-sizing: border-box;
+  margin-top: -12px;
 }
 
 .emotion-39 {
@@ -5383,6 +5390,11 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
   --Grid-parent-rowSpacing: 0px;
 }
 
+.emotion-66 {
+  min-width: 0;
+  box-sizing: border-box;
+}
+
 .emotion-67 {
   margin-top: 16px;
 }
@@ -5789,7 +5801,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                       for="root_items_0"
                                       id="root_items_0-label"
                                     >
-                                      items-0
+                                      items-1
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-33"
@@ -5818,7 +5830,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                           class="emotion-9"
                                         >
                                           <span>
-                                            items-0 *
+                                            items-1 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -5926,7 +5938,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                       for="root_items_1"
                                       id="root_items_1-label"
                                     >
-                                      items-1
+                                      items-2
                                       <span
                                         aria-hidden="true"
                                         class="MuiFormLabel-asterisk MuiInputLabel-asterisk emotion-33"
@@ -5955,7 +5967,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                                           class="emotion-9"
                                         >
                                           <span>
-                                            items-1 *
+                                            items-2 *
                                           </span>
                                         </legend>
                                       </fieldset>
@@ -6034,7 +6046,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-7:focus::-ms-input-p
                       class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-row emotion-65"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-38"
+                        class="MuiGrid-root MuiGrid-direction-xs-row emotion-66"
                       >
                         <div
                           class="MuiBox-root emotion-67"
diff --git a/packages/primereact/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/primereact/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index e68d6b8e5f..ec27e82af5 100644
--- a/packages/primereact/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/primereact/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -16,7 +16,7 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;
+  const { children, buttonsProps, displayLabel, hasToolbar, uiSchema, registry } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -26,7 +26,7 @@ export default function ArrayFieldItemTemplate<
   return (
     <div style={{ position: 'relative' }}>
       {hasToolbar && (
-        <div style={{ position: 'absolute', right: 0, top: '-10px' }}>
+        <div style={{ position: 'absolute', right: 0, top: displayLabel ? '24px' : 0 }}>
           {hasToolbar && (
             <div style={{ flexDirection: 'row' }}>
               <ArrayFieldItemButtonsTemplate {...buttonsProps} />
diff --git a/packages/primereact/test/__snapshots__/Array.test.tsx.snap b/packages/primereact/test/__snapshots__/Array.test.tsx.snap
index 667dc256e9..854adca531 100644
--- a/packages/primereact/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/primereact/test/__snapshots__/Array.test.tsx.snap
@@ -124,7 +124,7 @@ exports[`array fields array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -229,7 +229,7 @@ exports[`array fields array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -817,7 +817,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -941,7 +941,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -1149,7 +1149,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -1236,7 +1236,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -1615,7 +1615,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -1713,7 +1713,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     style="position: relative;"
                                   >
                                     <div
-                                      style="position: absolute; right: 0px; top: -10px;"
+                                      style="position: absolute; right: 0px; top: 24px;"
                                     >
                                       <div
                                         style="flex-direction: row;"
@@ -1800,7 +1800,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     style="position: relative;"
                                   >
                                     <div
-                                      style="position: absolute; right: 0px; top: -10px;"
+                                      style="position: absolute; right: 0px; top: 24px;"
                                     >
                                       <div
                                         style="flex-direction: row;"
@@ -1917,7 +1917,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -2015,7 +2015,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     style="position: relative;"
                                   >
                                     <div
-                                      style="position: absolute; right: 0px; top: -10px;"
+                                      style="position: absolute; right: 0px; top: 24px;"
                                     >
                                       <div
                                         style="flex-direction: row;"
@@ -2102,7 +2102,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     style="position: relative;"
                                   >
                                     <div
-                                      style="position: absolute; right: 0px; top: -10px;"
+                                      style="position: absolute; right: 0px; top: 24px;"
                                     >
                                       <div
                                         style="flex-direction: row;"
@@ -2303,7 +2303,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -2427,7 +2427,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -2635,7 +2635,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -2722,7 +2722,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -2986,7 +2986,7 @@ exports[`with title and description array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -3103,7 +3103,7 @@ exports[`with title and description array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -3590,7 +3590,7 @@ exports[`with title and description from both array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -3707,7 +3707,7 @@ exports[`with title and description from both array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -4194,7 +4194,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -4311,7 +4311,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 24px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -4788,7 +4788,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
@@ -4893,7 +4893,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     style="position: relative;"
                   >
                     <div
-                      style="position: absolute; right: 0px; top: -10px;"
+                      style="position: absolute; right: 0px; top: 0px;"
                     >
                       <div
                         style="flex-direction: row;"
diff --git a/packages/primereact/test/__snapshots__/Form.test.tsx.snap b/packages/primereact/test/__snapshots__/Form.test.tsx.snap
index 96f6033a6a..dbdeaa9951 100644
--- a/packages/primereact/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/primereact/test/__snapshots__/Form.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 0px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -209,7 +209,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 0px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -479,7 +479,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -571,7 +571,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1432,7 +1432,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 0px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1594,7 +1594,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 0px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1864,7 +1864,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1956,7 +1956,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -6087,7 +6087,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -6871,7 +6871,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
diff --git a/packages/primereact/test/__snapshots__/Object.test.tsx.snap b/packages/primereact/test/__snapshots__/Object.test.tsx.snap
index cdbcb968f9..cf38cfabbc 100644
--- a/packages/primereact/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/primereact/test/__snapshots__/Object.test.tsx.snap
@@ -485,7 +485,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -577,7 +577,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1077,7 +1077,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
@@ -1169,7 +1169,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                         style="position: relative;"
                       >
                         <div
-                          style="position: absolute; right: 0px; top: -10px;"
+                          style="position: absolute; right: 0px; top: 24px;"
                         >
                           <div
                             style="flex-direction: row;"
diff --git a/packages/react-bootstrap/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/react-bootstrap/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index a15892c945..3e99246849 100644
--- a/packages/react-bootstrap/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/react-bootstrap/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -15,7 +15,7 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, uiSchema, registry } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -28,13 +28,14 @@ export default function ArrayFieldItemTemplate<
     paddingRight: 6,
     fontWeight: 'bold',
   };
+  const padding = hasDescription ? 'pb-1' : 'pt-4 mt-2';
   return (
     <div>
       <Row className='mb-2  d-flex align-items-center'>
-        <Col xs='9' lg='9'>
+        <Col xs='8' md='9' lg='10'>
           {children}
         </Col>
-        <Col xs='3' lg='3' className='py-4'>
+        <Col xs='4' md='3' lg='2' className={displayLabel ? padding : 'py-4'}>
           {hasToolbar && (
             <div className='d-flex flex-row'>
               <ArrayFieldItemButtonsTemplate {...buttonsProps} style={btnStyle} />
diff --git a/packages/react-bootstrap/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx b/packages/react-bootstrap/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
index cec4baa979..d622be886d 100644
--- a/packages/react-bootstrap/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
+++ b/packages/react-bootstrap/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
@@ -72,8 +72,8 @@ export default function ArrayFieldTemplate<
             {canAdd && (
               <Container className=''>
                 <Row className='mt-2'>
-                  <Col xs={9}></Col>
-                  <Col xs={3} className='py-4 col-lg-3 col-3'>
+                  <Col xs={9} md={10} lg={11}></Col>
+                  <Col xs={3} md={2} lg={1} className='py-4'>
                     <AddButton
                       id={buttonId(fieldPathId, 'add')}
                       className='rjsf-array-item-add'
diff --git a/packages/react-bootstrap/test/__snapshots__/Array.test.tsx.snap b/packages/react-bootstrap/test/__snapshots__/Array.test.tsx.snap
index eeff62e76f..3c77bb5fcc 100644
--- a/packages/react-bootstrap/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/react-bootstrap/test/__snapshots__/Array.test.tsx.snap
@@ -26,10 +26,10 @@ exports[`array fields array 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -104,7 +104,7 @@ exports[`array fields array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -130,7 +130,7 @@ exports[`array fields array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -231,7 +231,7 @@ exports[`array fields array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -257,7 +257,7 @@ exports[`array fields array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -360,10 +360,10 @@ exports[`array fields array icons 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -549,7 +549,7 @@ exports[`array fields fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -575,7 +575,7 @@ exports[`array fields fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -584,7 +584,7 @@ exports[`array fields fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -611,7 +611,7 @@ exports[`array fields fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -811,7 +811,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-object"
@@ -888,7 +888,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -963,7 +963,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-object"
@@ -1040,7 +1040,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -1117,10 +1117,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1195,7 +1195,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -1221,7 +1221,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -1296,7 +1296,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -1322,7 +1322,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -1399,10 +1399,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1530,7 +1530,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -1556,7 +1556,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -1565,7 +1565,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -1592,7 +1592,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -1601,7 +1601,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-boolean"
@@ -1627,7 +1627,7 @@ exports[`nameGenerator bracketNameGenerator fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -1673,7 +1673,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-array"
@@ -1694,7 +1694,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mb-2  d-flex align-items-center row"
                                     >
                                       <div
-                                        class="col-lg-9 col-9"
+                                        class="col-lg-10 col-md-9 col-8"
                                       >
                                         <div
                                           class="rjsf-field rjsf-field-string"
@@ -1720,7 +1720,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                         </div>
                                       </div>
                                       <div
-                                        class="py-4 col-lg-3 col-3"
+                                        class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                                       >
                                         <div
                                           class="d-flex flex-row"
@@ -1795,7 +1795,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mb-2  d-flex align-items-center row"
                                     >
                                       <div
-                                        class="col-lg-9 col-9"
+                                        class="col-lg-10 col-md-9 col-8"
                                       >
                                         <div
                                           class="rjsf-field rjsf-field-string"
@@ -1821,7 +1821,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                         </div>
                                       </div>
                                       <div
-                                        class="py-4 col-lg-3 col-3"
+                                        class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                                       >
                                         <div
                                           class="d-flex flex-row"
@@ -1898,10 +1898,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mt-2 row"
                                     >
                                       <div
-                                        class="col-9"
+                                        class="col-lg-11 col-md-10 col-9"
                                       />
                                       <div
-                                        class="py-4 col-lg-3 col-3 col-3"
+                                        class="py-4 col-lg-1 col-md-2 col-3"
                                       >
                                         <button
                                           class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1942,7 +1942,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -2017,7 +2017,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-array"
@@ -2038,7 +2038,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mb-2  d-flex align-items-center row"
                                     >
                                       <div
-                                        class="col-lg-9 col-9"
+                                        class="col-lg-10 col-md-9 col-8"
                                       >
                                         <div
                                           class="rjsf-field rjsf-field-string"
@@ -2064,7 +2064,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                         </div>
                                       </div>
                                       <div
-                                        class="py-4 col-lg-3 col-3"
+                                        class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                                       >
                                         <div
                                           class="d-flex flex-row"
@@ -2139,7 +2139,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mb-2  d-flex align-items-center row"
                                     >
                                       <div
-                                        class="col-lg-9 col-9"
+                                        class="col-lg-10 col-md-9 col-8"
                                       >
                                         <div
                                           class="rjsf-field rjsf-field-string"
@@ -2165,7 +2165,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                         </div>
                                       </div>
                                       <div
-                                        class="py-4 col-lg-3 col-3"
+                                        class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                                       >
                                         <div
                                           class="d-flex flex-row"
@@ -2242,10 +2242,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       class="mt-2 row"
                                     >
                                       <div
-                                        class="col-9"
+                                        class="col-lg-11 col-md-10 col-9"
                                       />
                                       <div
-                                        class="py-4 col-lg-3 col-3 col-3"
+                                        class="py-4 col-lg-1 col-md-2 col-3"
                                       >
                                         <button
                                           class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -2286,7 +2286,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -2363,10 +2363,10 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -2441,7 +2441,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-object"
@@ -2518,7 +2518,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -2593,7 +2593,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-object"
@@ -2670,7 +2670,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -2747,10 +2747,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -2825,7 +2825,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -2851,7 +2851,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -2926,7 +2926,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -2952,7 +2952,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -3029,10 +3029,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -3129,10 +3129,10 @@ exports[`with title and description array 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -3227,7 +3227,7 @@ exports[`with title and description array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -3265,7 +3265,7 @@ exports[`with title and description array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -3366,7 +3366,7 @@ exports[`with title and description array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -3404,7 +3404,7 @@ exports[`with title and description array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -3507,10 +3507,10 @@ exports[`with title and description array icons 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -3672,7 +3672,7 @@ exports[`with title and description fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -3710,7 +3710,7 @@ exports[`with title and description fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -3719,7 +3719,7 @@ exports[`with title and description fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -3758,7 +3758,7 @@ exports[`with title and description fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -3826,10 +3826,10 @@ exports[`with title and description from both array 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -3924,7 +3924,7 @@ exports[`with title and description from both array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -3962,7 +3962,7 @@ exports[`with title and description from both array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -4063,7 +4063,7 @@ exports[`with title and description from both array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -4101,7 +4101,7 @@ exports[`with title and description from both array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -4204,10 +4204,10 @@ exports[`with title and description from both array icons 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4369,7 +4369,7 @@ exports[`with title and description from both fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -4407,7 +4407,7 @@ exports[`with title and description from both fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -4416,7 +4416,7 @@ exports[`with title and description from both fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -4455,7 +4455,7 @@ exports[`with title and description from both fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -4523,10 +4523,10 @@ exports[`with title and description from uiSchema array 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4621,7 +4621,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -4659,7 +4659,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -4760,7 +4760,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -4798,7 +4798,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -4901,10 +4901,10 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5066,7 +5066,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -5104,7 +5104,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -5113,7 +5113,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -5152,7 +5152,7 @@ exports[`with title and description from uiSchema fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="pb-1 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -5200,10 +5200,10 @@ exports[`with title and description with global label off array 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5278,7 +5278,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -5298,7 +5298,7 @@ exports[`with title and description with global label off array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -5399,7 +5399,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -5419,7 +5419,7 @@ exports[`with title and description with global label off array icons 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     >
                       <div
                         class="d-flex flex-row"
@@ -5522,10 +5522,10 @@ exports[`with title and description with global label off array icons 1`] = `
                     class="mt-2 row"
                   >
                     <div
-                      class="col-9"
+                      class="col-lg-11 col-md-10 col-9"
                     />
                     <div
-                      class="py-4 col-lg-3 col-3 col-3"
+                      class="py-4 col-lg-1 col-md-2 col-3"
                     >
                       <button
                         class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5667,7 +5667,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-string"
@@ -5687,7 +5687,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
@@ -5696,7 +5696,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                     class="mb-2  d-flex align-items-center row"
                   >
                     <div
-                      class="col-lg-9 col-9"
+                      class="col-lg-10 col-md-9 col-8"
                     >
                       <div
                         class="rjsf-field rjsf-field-number"
@@ -5717,7 +5717,7 @@ exports[`with title and description with global label off fixed array 1`] = `
                       </div>
                     </div>
                     <div
-                      class="py-4 col-lg-3 col-3"
+                      class="py-4 col-lg-2 col-md-3 col-4"
                     />
                   </div>
                 </div>
diff --git a/packages/react-bootstrap/test/__snapshots__/Form.test.tsx.snap b/packages/react-bootstrap/test/__snapshots__/Form.test.tsx.snap
index 8a7a3890a0..b853324b59 100644
--- a/packages/react-bootstrap/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/react-bootstrap/test/__snapshots__/Form.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-object"
@@ -146,7 +146,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="py-4 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -221,7 +221,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-object"
@@ -317,7 +317,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="py-4 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -394,10 +394,10 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -504,7 +504,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -530,7 +530,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -605,7 +605,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -631,7 +631,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -708,10 +708,10 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1495,7 +1495,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-object"
@@ -1590,7 +1590,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="py-4 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -1665,7 +1665,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-object"
@@ -1761,7 +1761,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="py-4 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -1838,10 +1838,10 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1948,7 +1948,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -1974,7 +1974,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -2049,7 +2049,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -2075,7 +2075,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -2152,10 +2152,10 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4126,10 +4126,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4211,10 +4211,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4296,10 +4296,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4386,10 +4386,10 @@ exports[`single fields optional data controls does not show optional controls wh
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4534,10 +4534,10 @@ exports[`single fields optional data controls does not show optional controls wh
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -4779,10 +4779,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                       class="mt-2 row"
                                     >
                                       <div
-                                        class="col-9"
+                                        class="col-lg-11 col-md-10 col-9"
                                       />
                                       <div
-                                        class="py-4 col-lg-3 col-3 col-3"
+                                        class="py-4 col-lg-1 col-md-2 col-3"
                                       >
                                         <button
                                           class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5094,10 +5094,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5180,10 +5180,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5266,10 +5266,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5357,10 +5357,10 @@ exports[`single fields optional data controls does not show optional controls wh
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5507,10 +5507,10 @@ exports[`single fields optional data controls does not show optional controls wh
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -5755,10 +5755,10 @@ exports[`single fields optional data controls does not show optional controls wh
                                       class="mt-2 row"
                                     >
                                       <div
-                                        class="col-9"
+                                        class="col-lg-11 col-md-10 col-9"
                                       />
                                       <div
-                                        class="py-4 col-lg-3 col-3 col-3"
+                                        class="py-4 col-lg-1 col-md-2 col-3"
                                       >
                                         <button
                                           class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -6117,10 +6117,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -6287,10 +6287,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -6412,7 +6412,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -6438,7 +6438,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -6474,10 +6474,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -6622,10 +6622,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -7102,10 +7102,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -7235,10 +7235,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                         class="mt-2 row"
                                       >
                                         <div
-                                          class="col-9"
+                                          class="col-lg-11 col-md-10 col-9"
                                         />
                                         <div
-                                          class="py-4 col-lg-3 col-3 col-3"
+                                          class="py-4 col-lg-1 col-md-2 col-3"
                                         >
                                           <button
                                             class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -7324,7 +7324,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -7351,7 +7351,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -7388,10 +7388,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -7538,10 +7538,10 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -8006,10 +8006,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -8474,10 +8474,10 @@ exports[`single fields optional data controls shows "add" optional controls when
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
diff --git a/packages/react-bootstrap/test/__snapshots__/Object.test.tsx.snap b/packages/react-bootstrap/test/__snapshots__/Object.test.tsx.snap
index f874379cf4..e3461945de 100644
--- a/packages/react-bootstrap/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/react-bootstrap/test/__snapshots__/Object.test.tsx.snap
@@ -540,7 +540,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -566,7 +566,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -641,7 +641,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -667,7 +667,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -744,10 +744,10 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
@@ -1222,7 +1222,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -1248,7 +1248,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -1323,7 +1323,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               class="mb-2  d-flex align-items-center row"
                             >
                               <div
-                                class="col-lg-9 col-9"
+                                class="col-lg-10 col-md-9 col-8"
                               >
                                 <div
                                   class="rjsf-field rjsf-field-string"
@@ -1349,7 +1349,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="py-4 col-lg-3 col-3"
+                                class="pt-4 mt-2 col-lg-2 col-md-3 col-4"
                               >
                                 <div
                                   class="d-flex flex-row"
@@ -1426,10 +1426,10 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               class="mt-2 row"
                             >
                               <div
-                                class="col-9"
+                                class="col-lg-11 col-md-10 col-9"
                               />
                               <div
-                                class="py-4 col-lg-3 col-3 col-3"
+                                class="py-4 col-lg-1 col-md-2 col-3"
                               >
                                 <button
                                   class="ml-1 rjsf-array-item-add btn btn-primary"
diff --git a/packages/semantic-ui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/semantic-ui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index 5f0664effa..bed70e29ac 100644
--- a/packages/semantic-ui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/semantic-ui/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -24,7 +24,8 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, uiSchema, registry, parentUiSchema } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, uiSchema, registry, parentUiSchema } =
+    props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
@@ -37,6 +38,7 @@ export default function ArrayFieldItemTemplate<
     defaultSchemaProps: { horizontalButtons: true, wrapItem: false },
   });
   const { horizontalButtons = true, wrapItem = false } = semanticProps;
+  const margin = hasDescription ? 5 : 24;
   return (
     <div className='rjsf-array-item'>
       <MaybeWrap wrap={wrapItem} component={Segment}>
@@ -46,7 +48,11 @@ export default function ArrayFieldItemTemplate<
           </Grid.Column>
           {hasToolbar && (
             <Grid.Column>
-              <Button.Group size='mini' vertical={!horizontalButtons}>
+              <Button.Group
+                size='mini'
+                vertical={!horizontalButtons}
+                style={{ marginTop: displayLabel ? `${margin}px` : undefined }}
+              >
                 <ArrayFieldItemButtonsTemplate {...buttonsProps} />
               </Button.Group>
             </Grid.Column>
diff --git a/packages/semantic-ui/test/__snapshots__/Array.test.tsx.snap b/packages/semantic-ui/test/__snapshots__/Array.test.tsx.snap
index 9dc314bb7b..766fee0b80 100644
--- a/packages/semantic-ui/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/semantic-ui/test/__snapshots__/Array.test.tsx.snap
@@ -105,6 +105,7 @@ exports[`array fields array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -193,6 +194,7 @@ exports[`array fields array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
@@ -1006,6 +1008,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -1084,6 +1087,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
@@ -1476,6 +1480,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   >
                                     <div
                                       class="ui mini buttons"
+                                      style="margin-top: 24px;"
                                     >
                                       <button
                                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -1554,6 +1559,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   >
                                     <div
                                       class="ui mini buttons"
+                                      style="margin-top: 24px;"
                                     >
                                       <button
                                         class="ui icon button rjsf-array-item-move-up"
@@ -1717,6 +1723,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   >
                                     <div
                                       class="ui mini buttons"
+                                      style="margin-top: 24px;"
                                     >
                                       <button
                                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -1795,6 +1802,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                   >
                                     <div
                                       class="ui mini buttons"
+                                      style="margin-top: 24px;"
                                     >
                                       <button
                                         class="ui icon button rjsf-array-item-move-up"
@@ -2269,6 +2277,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -2347,6 +2356,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 24px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
@@ -2523,7 +2533,7 @@ exports[`with title and description array icons 1`] = `
                           <label
                             for="root_0"
                           >
-                            Test item
+                            Test field-1
                           </label>
                           <div
                             class="ui fluid input"
@@ -2553,6 +2563,7 @@ exports[`with title and description array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -2622,7 +2633,7 @@ exports[`with title and description array icons 1`] = `
                           <label
                             for="root_1"
                           >
-                            Test item
+                            Test field-2
                           </label>
                           <div
                             class="ui fluid input"
@@ -2652,6 +2663,7 @@ exports[`with title and description array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
@@ -2881,7 +2893,7 @@ exports[`with title and description fixed array 1`] = `
                           <label
                             for="root_0"
                           >
-                            Test item
+                            Test field-1
                           </label>
                           <div
                             class="ui fluid input"
@@ -2930,7 +2942,7 @@ exports[`with title and description fixed array 1`] = `
                           <label
                             for="root_1"
                           >
-                            Test item
+                            Test field-2
                           </label>
                           <div
                             class="ui fluid input"
@@ -3113,6 +3125,7 @@ exports[`with title and description from both array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -3212,6 +3225,7 @@ exports[`with title and description from both array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
@@ -3673,6 +3687,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon disabled button rjsf-array-item-move-up"
@@ -3772,6 +3787,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                   >
                     <div
                       class="ui mini buttons"
+                      style="margin-top: 5px;"
                     >
                       <button
                         class="ui icon button rjsf-array-item-move-up"
diff --git a/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap b/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
index 551b9c155a..d2b432fb54 100644
--- a/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
@@ -370,7 +370,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               <label
                                 for="root_tags_0"
                               >
-                                tags-0
+                                tags-1
                               </label>
                               <div
                                 class="ui fluid input"
@@ -394,6 +394,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon disabled button rjsf-array-item-move-up"
@@ -453,7 +454,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               <label
                                 for="root_tags_1"
                               >
-                                tags-1
+                                tags-2
                               </label>
                               <div
                                 class="ui fluid input"
@@ -477,6 +478,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon button rjsf-array-item-move-up"
@@ -1560,7 +1562,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               <label
                                 for="root_tags_0"
                               >
-                                tags-0
+                                tags-1
                               </label>
                               <div
                                 class="ui fluid input"
@@ -1584,6 +1586,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon disabled button rjsf-array-item-move-up"
@@ -1643,7 +1646,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               <label
                                 for="root_tags_1"
                               >
-                                tags-1
+                                tags-2
                               </label>
                               <div
                                 class="ui fluid input"
@@ -1667,6 +1670,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon button rjsf-array-item-move-up"
@@ -5219,7 +5223,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               <label
                                 for="root_nestedArrayOptional_0"
                               >
-                                nestedArrayOptional-0
+                                nestedArrayOptional-1
                               </label>
                               <div
                                 class="ui fluid input"
@@ -5243,6 +5247,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon button rjsf-array-item-remove"
@@ -5750,7 +5755,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               <label
                                 for="root_nestedArrayOptional_0"
                               >
-                                nestedArrayOptional-0
+                                nestedArrayOptional-1
                               </label>
                               <div
                                 class="ui disabled fluid input"
@@ -5776,6 +5781,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon disabled button rjsf-array-item-remove"
diff --git a/packages/semantic-ui/test/__snapshots__/Object.test.tsx.snap b/packages/semantic-ui/test/__snapshots__/Object.test.tsx.snap
index 8b8d9a73b9..1ebafdef4a 100644
--- a/packages/semantic-ui/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/semantic-ui/test/__snapshots__/Object.test.tsx.snap
@@ -468,7 +468,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               <label
                                 for="root_tags_0"
                               >
-                                tags-0
+                                tags-1
                               </label>
                               <div
                                 class="ui fluid input"
@@ -492,6 +492,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon disabled button rjsf-array-item-move-up"
@@ -551,7 +552,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               <label
                                 for="root_tags_1"
                               >
-                                tags-1
+                                tags-2
                               </label>
                               <div
                                 class="ui fluid input"
@@ -575,6 +576,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon button rjsf-array-item-move-up"
@@ -1003,7 +1005,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               <label
                                 for="root_items_0"
                               >
-                                items-0
+                                items-1
                               </label>
                               <div
                                 class="ui fluid input"
@@ -1027,6 +1029,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon disabled button rjsf-array-item-move-up"
@@ -1086,7 +1089,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               <label
                                 for="root_items_1"
                               >
-                                items-1
+                                items-2
                               </label>
                               <div
                                 class="ui fluid input"
@@ -1110,6 +1113,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                       >
                         <div
                           class="ui mini buttons"
+                          style="margin-top: 24px;"
                         >
                           <button
                             class="ui icon button rjsf-array-item-move-up"
diff --git a/packages/shadcn/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx b/packages/shadcn/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
index 8c717538d3..c2d55b3f69 100644
--- a/packages/shadcn/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
+++ b/packages/shadcn/src/ArrayFieldItemTemplate/ArrayFieldItemTemplate.tsx
@@ -16,20 +16,24 @@ export default function ArrayFieldItemTemplate<
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
 >(props: ArrayFieldItemTemplateProps<T, S, F>) {
-  const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;
+  const { children, buttonsProps, displayLabel, hasDescription, hasToolbar, uiSchema, registry } = props;
   const uiOptions = getUiOptions<T, S, F>(uiSchema);
   const ArrayFieldItemButtonsTemplate = getTemplate<'ArrayFieldItemButtonsTemplate', T, S, F>(
     'ArrayFieldItemButtonsTemplate',
     registry,
     uiOptions,
   );
+  const margin = hasDescription ? -6 : 22;
   return (
     <div>
       <div className='mb-2 flex flex-row flex-wrap items-center'>
         <div className='grow shrink'>{children}</div>
         <div className='flex items-end justify-end p-0.5'>
           {hasToolbar && (
-            <div className='flex gap-2'>
+            <div
+              className='flex gap-2'
+              style={{ marginLeft: '5px', marginTop: displayLabel ? `${margin}px` : undefined }}
+            >
               <ArrayFieldItemButtonsTemplate {...buttonsProps} />
             </div>
           )}
diff --git a/packages/shadcn/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx b/packages/shadcn/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
index 88d4f55403..be044b9af9 100644
--- a/packages/shadcn/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
+++ b/packages/shadcn/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
@@ -71,7 +71,7 @@ export default function ArrayFieldTemplate<
             {!showOptionalDataControlInTitle ? optionalDataControl : undefined}
             {items}
             {canAdd && (
-              <div className='mt-2 flex'>
+              <div className='mt-2 flex justify-end'>
                 <AddButton
                   id={buttonId(fieldPathId, 'add')}
                   className='rjsf-array-item-add'
diff --git a/packages/shadcn/test/__snapshots__/Array.test.tsx.snap b/packages/shadcn/test/__snapshots__/Array.test.tsx.snap
index d552a70790..2dda529a57 100644
--- a/packages/shadcn/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/shadcn/test/__snapshots__/Array.test.tsx.snap
@@ -22,7 +22,7 @@ exports[`array fields array 1`] = `
                 class="p-0 m-0 w-full mb-2"
               >
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -144,6 +144,7 @@ exports[`array fields array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -312,6 +313,7 @@ exports[`array fields array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -439,7 +441,7 @@ exports[`array fields array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -1073,6 +1075,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1264,6 +1267,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1358,7 +1362,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -1480,6 +1484,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1615,6 +1620,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1709,7 +1715,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -2129,6 +2135,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       >
                                         <div
                                           class="flex gap-2"
+                                          style="margin-left: 5px; margin-top: 22px;"
                                         >
                                           <button
                                             class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2264,6 +2271,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       >
                                         <div
                                           class="flex gap-2"
+                                          style="margin-left: 5px; margin-top: 22px;"
                                         >
                                           <button
                                             class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2358,7 +2366,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     </div>
                                   </div>
                                   <div
-                                    class="mt-2 flex"
+                                    class="mt-2 flex justify-end"
                                   >
                                     <div
                                       class="p-0 m-0"
@@ -2410,6 +2418,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2568,6 +2577,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       >
                                         <div
                                           class="flex gap-2"
+                                          style="margin-left: 5px; margin-top: 22px;"
                                         >
                                           <button
                                             class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2703,6 +2713,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                       >
                                         <div
                                           class="flex gap-2"
+                                          style="margin-left: 5px; margin-top: 22px;"
                                         >
                                           <button
                                             class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2797,7 +2808,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                                     </div>
                                   </div>
                                   <div
-                                    class="mt-2 flex"
+                                    class="mt-2 flex justify-end"
                                   >
                                     <div
                                       class="p-0 m-0"
@@ -2849,6 +2860,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2943,7 +2955,7 @@ exports[`nameGenerator bracketNameGenerator nested arrays 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -3121,6 +3133,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -3312,6 +3325,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -3406,7 +3420,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -3528,6 +3542,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -3663,6 +3678,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: 22px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -3757,7 +3773,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -3862,7 +3878,7 @@ exports[`with title and description array 1`] = `
                 class="p-0 m-0 w-full mb-2"
               >
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -4020,6 +4036,7 @@ exports[`with title and description array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -4200,6 +4217,7 @@ exports[`with title and description array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -4327,7 +4345,7 @@ exports[`with title and description array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -4691,7 +4709,7 @@ exports[`with title and description from both array 1`] = `
                 class="p-0 m-0 w-full mb-2"
               >
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -4849,6 +4867,7 @@ exports[`with title and description from both array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -5029,6 +5048,7 @@ exports[`with title and description from both array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -5156,7 +5176,7 @@ exports[`with title and description from both array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -5520,7 +5540,7 @@ exports[`with title and description from uiSchema array 1`] = `
                 class="p-0 m-0 w-full mb-2"
               >
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -5678,6 +5698,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -5858,6 +5879,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px; margin-top: -6px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -5985,7 +6007,7 @@ exports[`with title and description from uiSchema array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -6325,7 +6347,7 @@ exports[`with title and description with global label off array 1`] = `
                 class="p-0 m-0 w-full mb-2"
               >
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
@@ -6441,6 +6463,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -6603,6 +6626,7 @@ exports[`with title and description with global label off array icons 1`] = `
                     >
                       <div
                         class="flex gap-2"
+                        style="margin-left: 5px;"
                       >
                         <button
                           class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -6730,7 +6754,7 @@ exports[`with title and description with global label off array icons 1`] = `
                   </div>
                 </div>
                 <div
-                  class="mt-2 flex"
+                  class="mt-2 flex justify-end"
                 >
                   <div
                     class="p-0 m-0"
diff --git a/packages/shadcn/test/__snapshots__/Form.test.tsx.snap b/packages/shadcn/test/__snapshots__/Form.test.tsx.snap
index f548f4041f..cc50a16d9f 100644
--- a/packages/shadcn/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/shadcn/test/__snapshots__/Form.test.tsx.snap
@@ -180,6 +180,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -425,6 +426,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -519,7 +521,7 @@ exports[`nameGenerator bracketNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -677,6 +679,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -812,6 +815,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -906,7 +910,7 @@ exports[`nameGenerator bracketNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -1993,6 +1997,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2238,6 +2243,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2332,7 +2338,7 @@ exports[`nameGenerator dotNotationNameGenerator array of objects 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -2490,6 +2496,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2625,6 +2632,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -2719,7 +2727,7 @@ exports[`nameGenerator dotNotationNameGenerator array of strings 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -5183,7 +5191,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -5270,7 +5278,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -5357,7 +5365,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -5449,7 +5457,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -5608,7 +5616,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -5905,7 +5913,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 class="p-0 m-0 w-full mb-2"
                               >
                                 <div
-                                  class="mt-2 flex"
+                                  class="mt-2 flex justify-end"
                                 >
                                   <div
                                     class="p-0 m-0"
@@ -6255,7 +6263,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -6343,7 +6351,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -6431,7 +6439,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -6524,7 +6532,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -6685,7 +6693,7 @@ exports[`single fields optional data controls does not show optional controls wh
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -6983,7 +6991,7 @@ exports[`single fields optional data controls does not show optional controls wh
                                 class="p-0 m-0 w-full mb-2"
                               >
                                 <div
-                                  class="mt-2 flex"
+                                  class="mt-2 flex justify-end"
                                 >
                                   <div
                                     class="p-0 m-0"
@@ -7388,7 +7396,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -7565,7 +7573,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -7747,6 +7755,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 border-destructive"
@@ -7790,7 +7799,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -7949,7 +7958,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -8464,7 +8473,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -8603,7 +8612,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                                     class="p-0 m-0 w-full mb-2"
                                   >
                                     <div
-                                      class="mt-2 flex"
+                                      class="mt-2 flex justify-end"
                                     >
                                       <div
                                         class="p-0 m-0"
@@ -8738,6 +8747,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 border-destructive"
@@ -8782,7 +8792,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -8943,7 +8953,7 @@ exports[`single fields optional data controls shows "add" and "remove" optional
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -9441,7 +9451,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -9939,7 +9949,7 @@ exports[`single fields optional data controls shows "add" optional controls when
                           class="p-0 m-0 w-full mb-2"
                         >
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
diff --git a/packages/shadcn/test/__snapshots__/Object.test.tsx.snap b/packages/shadcn/test/__snapshots__/Object.test.tsx.snap
index 972a57efe0..7f3701ef10 100644
--- a/packages/shadcn/test/__snapshots__/Object.test.tsx.snap
+++ b/packages/shadcn/test/__snapshots__/Object.test.tsx.snap
@@ -701,6 +701,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -836,6 +837,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -930,7 +932,7 @@ exports[`nameGenerator bracketNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
@@ -1510,6 +1512,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1645,6 +1648,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                               >
                                 <div
                                   class="flex gap-2"
+                                  style="margin-left: 5px; margin-top: 22px;"
                                 >
                                   <button
                                     class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 size-9 rjsf-array-item-move-up"
@@ -1739,7 +1743,7 @@ exports[`nameGenerator dotNotationNameGenerator object with mixed types 1`] = `
                             </div>
                           </div>
                           <div
-                            class="mt-2 flex"
+                            class="mt-2 flex justify-end"
                           >
                             <div
                               class="p-0 m-0"
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index adec84d859..cf2ffb8bf5 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -738,6 +738,10 @@ export type ArrayFieldItemTemplateProps<
    * customization in some themes
    */
   parentUiSchema?: UiSchema<T, S, F>;
+  /** A boolean flag indicating whether the label for the field is being shown, used to assist buttons placement */
+  displayLabel?: boolean;
+  /** A boolean flag indicating whether there is a description for the field, used to assist buttons placement */
+  hasDescription?: boolean;
 };
 
 /** The common properties of the two container templates: `ArrayFieldTemplateProps` and `ObjectFieldTemplateProps` */