diff --git a/config/install/schemadotorg.settings.yml b/config/install/schemadotorg.settings.yml
index 93d8f497fdd42e005d65388b080292a754e66943..ecd4f2c4db248a7c7d67a55d4df7e6feb44501e7 100644
--- a/config/install/schemadotorg.settings.yml
+++ b/config/install/schemadotorg.settings.yml
@@ -943,7 +943,6 @@ schema_properties:
     - editEIDR
     - encoding
     - encodingFormat
-    - funder
     - funding
     - geoContains
     - geoCoveredBy
diff --git a/modules/schemadotorg_additional_type/src/Controller/SchemaDotOrgAdditionalTypeHtmlEntityFormController.php b/modules/schemadotorg_additional_type/src/Controller/SchemaDotOrgAdditionalTypeHtmlEntityFormController.php
index f0e885b11408d45680b64ad076c1fbf2297ffdb4..7b616711fdd563e5f770a3757c0050f867bc4c9c 100644
--- a/modules/schemadotorg_additional_type/src/Controller/SchemaDotOrgAdditionalTypeHtmlEntityFormController.php
+++ b/modules/schemadotorg_additional_type/src/Controller/SchemaDotOrgAdditionalTypeHtmlEntityFormController.php
@@ -125,8 +125,10 @@ class SchemaDotOrgAdditionalTypeHtmlEntityFormController extends FormController
     ];
     return [
       '#theme' => 'links',
-      '#prefix' => '<h2>' . $this->t('Please select the %item type you want to @action.', $t_args) . '</h2>',
+      '#title' => $this->t('Please select the %item type you want to @action.', $t_args),
       '#links' => $links,
+      '#prefix' => '<br/>',
+      '#suffix' => '<br/>',
       '#cache' => [
         'contexts' => ['url.query_args:' . $field_name],
       ],
diff --git a/modules/schemadotorg_additional_type/tests/src/Functional/SchemaDotOrgAdditionalTypeTest.php b/modules/schemadotorg_additional_type/tests/src/Functional/SchemaDotOrgAdditionalTypeTest.php
index fb014136568ad1820772d5032271ea4d46a7bd0a..630c9e360344e5098d49f0a10c3ebe39fb026064 100644
--- a/modules/schemadotorg_additional_type/tests/src/Functional/SchemaDotOrgAdditionalTypeTest.php
+++ b/modules/schemadotorg_additional_type/tests/src/Functional/SchemaDotOrgAdditionalTypeTest.php
@@ -141,16 +141,14 @@ class SchemaDotOrgAdditionalTypeTest extends SchemaDotOrgBrowserTestBase {
 
     // Check that create node displays the additional type selection page.
     $this->drupalGet('/node/add/event');
-    $assert->responseContains('<h1>Create Event</h1>');
-    $assert->responseContains('<h2>Please select the <em class="placeholder">Event</em> type you want to create.</h2>');
+    $assert->responseContains('<h1>Please select the <em class="placeholder">Event</em> type you want to create.</h1>');
     $assert->linkExists('Business Event');
     $assert->linkByHrefExists('/node/add/event?schema_event_type=BusinessEvent');
     $assert->fieldNotExists('schema_event_type');
 
     // Check that create node displays the form when additional type is defined.
     $this->drupalGet('/node/add/event', ['query' => ['schema_event_type' => 'BusinessEvent']]);
-    $assert->responseContains('<h1>Create Business Event</h1>');
-    $assert->responseNotContains('<h2>Please select the <em class="placeholder">Event</em> type you want to create.</h2>');
+    $assert->responseNotContains('<h1>Please select the <em class="placeholder">Event</em> type you want to create.</h1>');
     $assert->linkNotExists('Business Event');
     $assert->linkByHrefNotExists('/node/add/event?schema_event_type=BusinessEvent');
     $assert->fieldNotExists('schema_event_type');
@@ -176,7 +174,7 @@ class SchemaDotOrgAdditionalTypeTest extends SchemaDotOrgBrowserTestBase {
     $this->drupalGet($event_node->toUrl('edit-form'), ['query' => ['schema_event_type' => '']]);
     $assert->fieldNotExists('schema_event_type');
     $assert->linkNotExists('Change type');
-    $assert->responseContains('<h2>Please select the <em class="placeholder">Event</em> type you want to change to.</h2>');
+    $assert->responseContains('<h1>Please select the <em class="placeholder">Event</em> type you want to change to.</h1>');
     $assert->linkExists('Childrens Event');
     $assert->linkByHrefExists($event_node->toUrl('edit-form')->toString() . '?schema_event_type=ChildrensEvent');