diff --git a/.changeset/lucky-spiders-fix.md b/.changeset/lucky-spiders-fix.md
new file mode 100644
index 00000000000..72f8fa212a4
--- /dev/null
+++ b/.changeset/lucky-spiders-fix.md
@@ -0,0 +1,5 @@
+---
+"@talend/react-forms": patch
+---
+
+Fix UI-Form display on TextModeArrayTemplate to have some spacing between templates
diff --git a/.changeset/wet-badgers-turn.md b/.changeset/wet-badgers-turn.md
new file mode 100644
index 00000000000..46fad0b0b2b
--- /dev/null
+++ b/.changeset/wet-badgers-turn.md
@@ -0,0 +1,5 @@
+---
+"@talend/react-components": patch
+---
+
+Fix Drawer z-index that could prevent headerbar to display sub-menu
diff --git a/packages/components/src/Drawer/Drawer.module.scss b/packages/components/src/Drawer/Drawer.module.scss
index 297cba56330..8b759c96921 100644
--- a/packages/components/src/Drawer/Drawer.module.scss
+++ b/packages/components/src/Drawer/Drawer.module.scss
@@ -8,7 +8,6 @@ $tc-drawer-header-background: tokens.$coral-color-neutral-background !default;
 $tc-drawer-header-border: tokens.$coral-border-s-solid tokens.$coral-color-neutral-border-weak !default;
 $tc-drawer-tabs-background: tokens.$coral-color-accent-background-weak !default;
 $tc-action-bar-background-color: tokens.$coral-color-neutral-background-medium !default;
-$tc-drawer-z-index: tokens.$coral-elevation-layer-standard-front !default;
 
 .tc-drawer {
 	pointer-events: all;
@@ -19,7 +18,6 @@ $tc-drawer-z-index: tokens.$coral-elevation-layer-standard-front !default;
 	right: 0;
 	bottom: 0;
 	width: tokens.$coral-sizing-maximal;
-	z-index: $tc-drawer-z-index;
 }
 
 @media (min-width: 992px) and (max-width: 1199px) {
diff --git a/packages/forms/src/UIForm/fieldsets/Array/displayMode/TextModeArrayTemplate.module.scss b/packages/forms/src/UIForm/fieldsets/Array/displayMode/TextModeArrayTemplate.module.scss
index e382379183a..d86ff408ea0 100644
--- a/packages/forms/src/UIForm/fieldsets/Array/displayMode/TextModeArrayTemplate.module.scss
+++ b/packages/forms/src/UIForm/fieldsets/Array/displayMode/TextModeArrayTemplate.module.scss
@@ -1,5 +1,10 @@
+@use '~@talend/design-tokens/lib/tokens';
+
 .tf-array-text-mode {
 	ol {
 		list-style: none;
+		display: flex;
+		flex-direction: column;
+		gap: tokens.$coral-spacing-xxs;
 	}
 }