diff --git a/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.hbs b/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.hbs
new file mode 100644
index 000000000..3fd9ab528
--- /dev/null
+++ b/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.hbs
@@ -0,0 +1,16 @@
+
+ {{#if this.showAdvanced}}
+
+ {{else}}
+
+ {{/if}}
+ {{t "caluma.form-builder.question.advancedSettings"}}
+
+
+{{#if this.showAdvanced}}
+ {{yield}}
+{{/if}}
\ No newline at end of file
diff --git a/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.js b/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.js
new file mode 100644
index 000000000..a76e673b4
--- /dev/null
+++ b/packages/form-builder/addon/components/cfb-form-editor/cfb-advanced-settings.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class CfbFormEditorCfbAdvancedSettings extends Component {
+ @tracked showAdvanced = false;
+}
diff --git a/packages/form-builder/addon/components/cfb-form-editor/general.hbs b/packages/form-builder/addon/components/cfb-form-editor/general.hbs
index c684760b5..ea2b9bf32 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/general.hbs
+++ b/packages/form-builder/addon/components/cfb-form-editor/general.hbs
@@ -49,6 +49,14 @@
@renderComponent={{component "cfb-toggle-switch" size="small"}}
/>
+
+
+
+
-
- {{#if this.showAdvanced}}
-
- {{else}}
-
- {{/if}}
- {{t "caluma.form-builder.question.advancedSettings"}}
-
-
- {{#if this.showAdvanced}}
+
{{#if (has-question-type f.model "action-button")}}
- {{/if}}
+
diff --git a/packages/form-builder/addon/gql/fragments/form-info.graphql b/packages/form-builder/addon/gql/fragments/form-info.graphql
index 4c8dd0467..c315a12c2 100644
--- a/packages/form-builder/addon/gql/fragments/form-info.graphql
+++ b/packages/form-builder/addon/gql/fragments/form-info.graphql
@@ -5,4 +5,5 @@ fragment FormInfo on Form {
description
isArchived
isPublished
+ meta
}
diff --git a/packages/form-builder/app/components/cfb-form-editor/cfb-advanced-settings.js b/packages/form-builder/app/components/cfb-form-editor/cfb-advanced-settings.js
new file mode 100644
index 000000000..ab13b0f9d
--- /dev/null
+++ b/packages/form-builder/app/components/cfb-form-editor/cfb-advanced-settings.js
@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-form-builder/components/cfb-form-editor/cfb-advanced-settings";