diff --git a/themes/buha/assets/css/generator.css b/themes/buha/assets/css/generator.css
index 6ffa0950..472b4d9e 100644
--- a/themes/buha/assets/css/generator.css
+++ b/themes/buha/assets/css/generator.css
@@ -1,5 +1,5 @@
 fieldset {
-    display: flex; flex-direction: row; padding: 0; border: none; margin: 0 0 .3rem .5rem;
+    display: flex; flex-wrap: wrap; flex-direction: row; padding: 0; border: none; margin: 0 0 .3rem .5rem;
 }
 
 input, textarea {
diff --git a/themes/buha/layouts/partials/layout/generator/expand.html b/themes/buha/layouts/partials/layout/generator/expand.html
index 7929c0a3..ac47c3fb 100644
--- a/themes/buha/layouts/partials/layout/generator/expand.html
+++ b/themes/buha/layouts/partials/layout/generator/expand.html
@@ -1,3 +1,3 @@
 
-    <input type="checkbox" name="{{ .name }}" id="{{ .name }}" value="true" style="font-size: smaller; margin-right: 0;" >
-    <label for="{{ .name }}" style="font-size: smaller; margin: 0;"> {{ if i18n "expand" }}{{ i18n "expand" }}{{ else }}{{ "expand" }}{{ end }}</label>
+   
+    <label style="font-size: smaller; margin: 0;"> <input type="checkbox" name="{{ .name }}" id="{{ .name }}" value="true" style="font-size: smaller; margin-right: 0;" /> {{ if i18n "expand" }}{{ i18n "expand" }}{{ else }}{{ "expand" }}{{ end }}</label>
diff --git a/themes/buha/layouts/partials/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html
index 38965166..298696d3 100644
--- a/themes/buha/layouts/partials/layout/generator/form.html
+++ b/themes/buha/layouts/partials/layout/generator/form.html
@@ -88,12 +88,10 @@
 
 
                 <div class="checkbox  {{ if ne .expanded true }}visibleIf margin_left_1rem stretch" data-visibleif-rule="{{ $in0 }}cat == 'true'{{end}}">
-
-
                         <div class="column margin_left_1rem">
-                        <fieldset id="{{ $in0 }}" name="{{ $in0 }}" class="fieldset">
+                        <fieldset>
                             {{ range sort $finale }}
-                                    <input type="checkbox" name="{{ $in0 }}" id="{{ $in0 }}-cat" value="{{ . }}"><label for="{{ $in0 }}-cat">{{ . }}</label>
+                                    <label><input type="checkbox" name="{{ $in0 }}{{ . }}" id="{{ $in0 }}{{ . }}" value="{{ . }}" />{{ . }}</label>
                             {{ end }}
                         </fieldset>
                         {{ if .new }}
@@ -155,7 +153,7 @@
                             {{ end }}
                         </fieldset>
                         {{ if .new }}
-                            <label id="label" for="new{{- .title -}}">{{ .new }} <span class="font_size_smaller">({{- $divide -}}{{- if .help -}}, {{ .help }}{{ end }})</span></label>
+                            <label id="id{{- .title -}}" for="new{{- .title -}}">{{ .new }} <span class="font_size_smaller">({{- $divide -}}{{- if .help -}}, {{ .help }}{{ end }})</span></label>
                             <input type="text" name="new{{- .title -}}" id="new{{- .title -}}" value="" {{ if .placeholder }}placeholder="{{ .placeholder }}"{{ end }} />
                         {{ end }}
                         </div>