diff --git a/spec/features/stash_datacite/dataset_versioning_spec.rb b/spec/features/stash_datacite/dataset_versioning_spec.rb
index 3d146282f1..1f8522ff07 100644
--- a/spec/features/stash_datacite/dataset_versioning_spec.rb
+++ b/spec/features/stash_datacite/dataset_versioning_spec.rb
@@ -352,7 +352,8 @@
   def update_dataset(curator: false)
     # Add a value to the dataset, submit it and then mock a successful submission
     navigate_to_metadata
-    find('#data_description_opener').click
+    description_divider = find('h2', text: 'Data Description')
+    description_divider.click
     fill_in 'related_identifier[related_identifier]', with: 'http://doi.org/10.5061/dryad.888gm50'
     # Submit the changes
     navigate_to_review
diff --git a/spec/features/stash_datacite/new_dataset_spec.rb b/spec/features/stash_datacite/new_dataset_spec.rb
index 1eedd58719..de83c7946f 100644
--- a/spec/features/stash_datacite/new_dataset_spec.rb
+++ b/spec/features/stash_datacite/new_dataset_spec.rb
@@ -61,7 +61,7 @@
 
       # ##############################
       # Optional fields
-      description_divider = find('summary', text: 'Data Description')
+      description_divider = find('h2', text: 'Data Description')
       description_divider.click
 
       # ##############################
diff --git a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_find_or_create.html.erb b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_find_or_create.html.erb
index 37687d1642..b853cf0024 100644
--- a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_find_or_create.html.erb
+++ b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_find_or_create.html.erb
@@ -1,4 +1,2 @@
-<main>
   <%= render partial: 'stash_datacite/metadata_entry_pages/metadata_entry_form' %>
   <%= render partial: 'stash_engine/shared/dataset_steps_bottom_nav' %>
-</main>
diff --git a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_metadata_entry_form.html.erb b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_metadata_entry_form.html.erb
index b3225536ed..f5242ab7aa 100644
--- a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_metadata_entry_form.html.erb
+++ b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_metadata_entry_form.html.erb
@@ -32,8 +32,7 @@
 
   <p class="c-input__required-note">required fields</p>
 
-  <details class="c-fgroup" role="group">
-    <summary class="o-showhide__summary c-fgroup__summary" id="data_description_opener">Data Description</summary>
+    <h2 class="o-heading__page-span">Data Description</h2>
 
     <% if @metadata_entry.subjects.empty? %>
     <%= render partial: "stash_datacite/subjects/form", locals: { subject: @metadata_entry.new_subject, resource_id: @resource.id } %>
@@ -58,7 +57,7 @@
           <%= render partial: "stash_datacite/contributors/form", locals: { contributor: @metadata_entry.new_contributor, path: stash_datacite.contributors_create_path } %>
       <% end %>
     </div>
-    <%= link_to "add another funder", stash_datacite.contributors_new_path( resource_id: @resource.id ), remote: :true, class: 't-describe__add-funder-button o-button__add', role: 'button' %>
+    <%= link_to "add another funder", stash_datacite.contributors_new_path( resource_id: @resource.id ), remote: :true, class: 't-describe__add-funder-button o-button__add' %>
     </fieldset>
 
     <fieldset class="c-fieldset">
@@ -74,4 +73,3 @@
     </div>
     <%= link_to "add another related work", stash_datacite.related_identifiers_new_path( resource_id: @resource.id ), remote: :true, class: 'o-button__add' %>
     </fieldset>
-  </details>
diff --git a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_publication.html.erb b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_publication.html.erb
index ec396605fa..a050fad0d1 100644
--- a/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_publication.html.erb
+++ b/stash/stash_datacite/app/views/stash_datacite/metadata_entry_pages/_publication.html.erb
@@ -1,6 +1,6 @@
-<p>My data is related to:</p>
+<p id="import-choices-label">My data is related to:</p>
 <%= form_for(@publication, url: publications_update_path, method: :patch, remote: true, authenticity_token: true) do |f| %>
-	<div class="c-import__choicesbox js-import-choice">
+	<div class="c-import__choicesbox js-import-choice" role="group" aria-labelledby="import-choices-label">
 		<div class="c-import__choicebox">
 			<div class="c-import__icon"><i class="fa fa-pencil-square-o fa-3x"></i></div>
 			<div>