diff --git a/gradle.properties b/gradle.properties
index f770b4e..9df1660 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 GROUP=com.fintecsystems
-VERSION_NAME=3.5.0
+VERSION_NAME=3.5.1
 POM_URL=https://github.com/FinTecSystems/xs2a-android
 POM_SCM_URL=git@github.com:FinTecSystems/xs2a-android.git
 POM_SCM_CONNECTION=scm:git:git@github.com:FinTecSystems/xs2a-android.git
diff --git a/xs2awizard/src/main/java/com/fintecsystems/xs2awizard/form/components/FlickerLine.kt b/xs2awizard/src/main/java/com/fintecsystems/xs2awizard/form/components/FlickerLine.kt
index 8c58378..bc580b9 100644
--- a/xs2awizard/src/main/java/com/fintecsystems/xs2awizard/form/components/FlickerLine.kt
+++ b/xs2awizard/src/main/java/com/fintecsystems/xs2awizard/form/components/FlickerLine.kt
@@ -86,7 +86,9 @@ fun FlickerLine(formData: FlickerLineData) {
         formData.value = JsonPrimitive(newValue.text)
     }
 
-    LabelledContainer(formData.label) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(5.dp)
+    ) {
         // Flicker container
         Column(
             verticalArrangement = Arrangement.spacedBy(5.dp)
@@ -109,7 +111,10 @@ fun FlickerLine(formData: FlickerLineData) {
                         colors = ButtonDefaults.buttonColors(backgroundColor = XS2ATheme.CURRENT.tintColor),
                         onClick = {
                             flickerContainerWidth =
-                                max(flickerContainerMinWidth, flickerContainerWidth - sizeStepSize)
+                                max(
+                                    flickerContainerMinWidth,
+                                    flickerContainerWidth - sizeStepSize
+                                )
                         }
                     ) {
                         Image(
@@ -187,10 +192,12 @@ fun FlickerLine(formData: FlickerLineData) {
             }
         }
 
-        FormTextField(
-            value = textFieldValue,
-            onValueChange = ::onValueChange,
-            placeholder = formData.placeholder
-        )
+        LabelledContainer(formData.label) {
+            FormTextField(
+                value = textFieldValue,
+                onValueChange = ::onValueChange,
+                placeholder = formData.placeholder
+            )
+        }
     }
 }