diff --git a/client/src/components/overlays/__snapshots__/AboutPanel.test.tsx.snap b/client/src/components/overlays/__snapshots__/AboutPanel.test.tsx.snap
index 8fd57b22..8d869e2d 100644
--- a/client/src/components/overlays/__snapshots__/AboutPanel.test.tsx.snap
+++ b/client/src/components/overlays/__snapshots__/AboutPanel.test.tsx.snap
@@ -16,7 +16,14 @@ exports[`AboutPanel renders correctly 1`] = `
       View, edit and analyze feature models in the browser - with support for real-time collaboration.
     </p>
     <p>
-      This project is released under the 
+      This project is a research effort of the 
+      <StyledLinkBase
+        href="http://www.dbse.ovgu.de/"
+        target="_blank"
+      >
+        DBSE working group
+      </StyledLinkBase>
+       and has been released under the 
       <StyledLinkBase
         href="https://github.com/ekuiter/variED/blob/master/LICENSE.txt"
         target="_blank"
@@ -25,6 +32,22 @@ exports[`AboutPanel renders correctly 1`] = `
       </StyledLinkBase>
       .
     </p>
+    <p>
+      If you would like to leave any feedback, use our 
+      <StyledLinkBase
+        href="https://goo.gl/forms/uUJmj68FYir9vEI13"
+        target="_blank"
+      >
+        online form
+      </StyledLinkBase>
+       or 
+      <StyledLinkBase
+        href="mailto:kuiter@ovgu.de"
+      >
+        mail me
+      </StyledLinkBase>
+      .
+    </p>
     <p>
       <StyledLinkBase
         href="https://github.com/ekuiter/variED"
diff --git a/client/src/components/overlays/__snapshots__/FeatureCallout.test.tsx.snap b/client/src/components/overlays/__snapshots__/FeatureCallout.test.tsx.snap
index 4e304fab..707c0873 100644
--- a/client/src/components/overlays/__snapshots__/FeatureCallout.test.tsx.snap
+++ b/client/src/components/overlays/__snapshots__/FeatureCallout.test.tsx.snap
@@ -44,6 +44,7 @@ exports[`FeatureCallout renders information for a feature with a description 1`]
       items={
         Array [
           Object {
+            "disabled": false,
             "iconOnly": true,
             "iconProps": Object {
               "iconName": "Add",
@@ -54,6 +55,7 @@ exports[`FeatureCallout renders information for a feature with a description 1`]
             "subMenuProps": Object {
               "items": Array [
                 Object {
+                  "disabled": false,
                   "iconProps": Object {
                     "iconName": "Add",
                   },
@@ -76,7 +78,6 @@ exports[`FeatureCallout renders information for a feature with a description 1`]
             "text": undefined,
           },
           Object {
-            "disabled": false,
             "iconOnly": true,
             "iconProps": Object {
               "iconName": "Remove",
@@ -87,6 +88,7 @@ exports[`FeatureCallout renders information for a feature with a description 1`]
             "subMenuProps": Object {
               "items": Array [
                 Object {
+                  "disabled": false,
                   "iconProps": Object {
                     "iconName": "Remove",
                   },
@@ -199,6 +201,7 @@ exports[`FeatureCallout renders information for a feature without a description
       items={
         Array [
           Object {
+            "disabled": false,
             "iconOnly": true,
             "iconProps": Object {
               "iconName": "Add",
@@ -209,6 +212,7 @@ exports[`FeatureCallout renders information for a feature without a description
             "subMenuProps": Object {
               "items": Array [
                 Object {
+                  "disabled": false,
                   "iconProps": Object {
                     "iconName": "Add",
                   },
@@ -231,7 +235,6 @@ exports[`FeatureCallout renders information for a feature without a description
             "text": undefined,
           },
           Object {
-            "disabled": false,
             "iconOnly": true,
             "iconProps": Object {
               "iconName": "Remove",
@@ -242,6 +245,7 @@ exports[`FeatureCallout renders information for a feature without a description
             "subMenuProps": Object {
               "items": Array [
                 Object {
+                  "disabled": false,
                   "iconProps": Object {
                     "iconName": "Remove",
                   },
diff --git a/client/src/components/overlays/__snapshots__/FeatureContextualMenu.test.tsx.snap b/client/src/components/overlays/__snapshots__/FeatureContextualMenu.test.tsx.snap
index 51d1b4e5..92667a4d 100644
--- a/client/src/components/overlays/__snapshots__/FeatureContextualMenu.test.tsx.snap
+++ b/client/src/components/overlays/__snapshots__/FeatureContextualMenu.test.tsx.snap
@@ -18,7 +18,6 @@ exports[`FeatureContextualMenu renders correctly for a selection of features 1`]
         "text": "New feature above",
       },
       Object {
-        "disabled": true,
         "iconOnly": false,
         "iconProps": Object {
           "iconName": "Remove",
@@ -29,6 +28,7 @@ exports[`FeatureContextualMenu renders correctly for a selection of features 1`]
         "subMenuProps": Object {
           "items": Array [
             Object {
+              "disabled": true,
               "iconProps": Object {
                 "iconName": "Remove",
               },
@@ -136,6 +136,7 @@ exports[`FeatureContextualMenu renders correctly for a selection of features 1`]
             },
             Object {
               "canCheck": true,
+              "disabled": false,
               "isChecked": false,
               "key": "hidden",
               "onClick": [Function],
@@ -209,6 +210,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
   items={
     Array [
       Object {
+        "disabled": false,
         "iconOnly": false,
         "iconProps": Object {
           "iconName": "Add",
@@ -219,6 +221,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
         "subMenuProps": Object {
           "items": Array [
             Object {
+              "disabled": false,
               "iconProps": Object {
                 "iconName": "Add",
               },
@@ -241,7 +244,6 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
         "text": "New",
       },
       Object {
-        "disabled": false,
         "iconOnly": false,
         "iconProps": Object {
           "iconName": "Remove",
@@ -252,6 +254,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
         "subMenuProps": Object {
           "items": Array [
             Object {
+              "disabled": false,
               "iconProps": Object {
                 "iconName": "Remove",
               },
@@ -322,6 +325,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
         "key": "divider",
       },
       Object {
+        "disabled": false,
         "iconProps": Object {
           "iconName": "Rename",
         },
@@ -331,6 +335,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
         "text": "Rename…",
       },
       Object {
+        "disabled": false,
         "iconProps": Object {
           "iconName": "TextDocument",
         },
@@ -367,6 +372,7 @@ exports[`FeatureContextualMenu renders correctly for a single feature 1`] = `
             },
             Object {
               "canCheck": true,
+              "disabled": false,
               "isChecked": false,
               "key": "hidden",
               "onClick": [Function],
diff --git a/client/src/helpers/Dialog.test.tsx b/client/src/helpers/Dialog.test.tsx
index cb8471a9..17572da7 100644
--- a/client/src/helpers/Dialog.test.tsx
+++ b/client/src/helpers/Dialog.test.tsx
@@ -107,7 +107,7 @@ describe('Dialog', () => {
                 wrapper = textFieldDialog(onSubmit, onDismiss);
             wrapper.find(TextField).simulate('change', null, 'some value');
             wrapper.find(PrimaryButton).simulate('click');
-            expect(onSubmit).toBeCalledWith('some value');
+            expect(onSubmit).toBeCalledWith('some value', {current: null});
             expect(onDismiss).toBeCalled();
         });
 
@@ -117,7 +117,7 @@ describe('Dialog', () => {
                 wrapper = textFieldDialog(onSubmit, onDismiss);
             wrapper.find(TextField).simulate('change', null, 'some value');
             wrapper.find(TextField).simulate('keyPress', {key: 'Enter'});
-            expect(onSubmit).toBeCalledWith('some value');
+            expect(onSubmit).toBeCalledWith('some value', {current: null});
             expect(onDismiss).toBeCalled();
         });