diff --git a/extension/qfq/qfq/AbstractBuildForm.php b/extension/qfq/qfq/AbstractBuildForm.php
index cca8fb65333f92ada2c2c70adca78e200537a075..a3c72f4a923f7fa4d7fc0079fcb77b5bb4bd1d0a 100644
--- a/extension/qfq/qfq/AbstractBuildForm.php
+++ b/extension/qfq/qfq/AbstractBuildForm.php
@@ -2715,7 +2715,8 @@ abstract class AbstractBuildForm {
      * @return mixed
      */
     public function buildNote(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) {
-        return Support::wrapTag("<div class='qfq-note'>", $value);
+//
+        return Support::wrapTag("<div class='" . CLASS_NOTE . "'>", $value);
     }
 
     /**
diff --git a/extension/qfq/qfq/BuildFormBootstrap.php b/extension/qfq/qfq/BuildFormBootstrap.php
index 1d51d8e12f085b77ebe177861c682bcd71843ae8..8dcfecbe915d8827dc3e6c6e36af7c909e04f18e 100644
--- a/extension/qfq/qfq/BuildFormBootstrap.php
+++ b/extension/qfq/qfq/BuildFormBootstrap.php
@@ -329,6 +329,11 @@ class BuildFormBootstrap extends AbstractBuildForm {
 
         // Button Save at bottom of form - only if there is a button text given.
         if ($this->formSpec[F_SUBMIT_BUTTON_TEXT] !== '') {
+
+
+            // Default setzen:
+            $this->fillWrapLabelInputNote($this->formSpec[F_BS_LABEL_COLUMNS], $this->formSpec[F_BS_INPUT_COLUMNS], $this->formSpec[F_BS_NOTE_COLUMNS]);
+
             $buttonText = $this->formSpec[F_SUBMIT_BUTTON_TEXT];
 
             $htmlElement = $this->buildButtonCode('save-button', $buttonText, '', '', $this->formSpec[F_BUTTON_ON_CHANGE_CLASS]);
@@ -429,7 +434,6 @@ EOF;
             [$this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_INPUT][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_INPUT);
 
         // Note
-//        $note = Support::wrapTag("<div class='qfq-note'>", $formElement[FE_NOTE], true);
         $note = $formElement[FE_NOTE];
         $html .= $this->customWrap($formElement, $note, FE_WRAP_NOTE, $formElement[FE_BS_NOTE_COLUMNS],
             [$this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_START], $this->wrap[WRAP_SETUP_NOTE][WRAP_SETUP_END]], $formElement[FE_HTML_ID] . HTML_ID_EXTENSION_NOTE);
diff --git a/extension/qfq/qfq/Constants.php b/extension/qfq/qfq/Constants.php
index e0fcc2bb89f8040952012550b9db9400f3a59c6c..80d4f02c0963216443b2cde258248433d3c64f43 100644
--- a/extension/qfq/qfq/Constants.php
+++ b/extension/qfq/qfq/Constants.php
@@ -460,6 +460,9 @@ const DATA_REQUIRED = 'data-required';
 
 const CLASS_TYPEAHEAD = 'qfq-typeahead';
 const DATA_TYPEAHEAD_SIP = 'data-typeahead-sip'; // Used for typeAhead
+
+const CLASS_NOTE = 'qfq-note';
+
 //const CLASS_TYPEAHEAD = 'qfq-type-ahead';
 //const DATA_TYPEAHEAD_SIP = 'data-sip'; // Used for typeAhead
 
diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index b041691d35276d3d3de4570702b210f2521d1ec5..24c6205bd2979743af44d3fe4d06be1ade054add 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -136,9 +136,12 @@ i.@{spinner_class} {
 
 .qfq-cc-style {
   font-size: 0.8em;
-  text-color: #ededed;
-  padding-left: 14px;
-  padding-top: 2px;
+  color: #777;
+  position: relative;
+  top: -24px;
+  right: 10px;
+  text-align: right;
+  display: block;
 }
 
 // TypeAhead Suggestions