diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb
index 645fa50..05ceef9 100644
--- a/app/views/contact_us/contacts/new.html.erb
+++ b/app/views/contact_us/contacts/new.html.erb
@@ -53,7 +53,7 @@
         <% end %>
         
         <div class="form-input">
-          <label></label>
+          <div class="button-spacer">&nbsp;</div>
           <%= render partial: 'shared/accessible_submit_button',
                      locals: {id: 'create_contact_submit', 
                               val: 'Submit', 
diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb
index 6fd93fc..2566667 100644
--- a/app/views/devise/registrations/_password_details.html.erb
+++ b/app/views/devise/registrations/_password_details.html.erb
@@ -36,7 +36,7 @@
     
     <br />
     <div class='form-input'>
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <%= render partial: 'shared/accessible_submit_button',
                  locals: {id: 'update',
                           val: 'Save',
diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index be39742..b716279 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -110,7 +110,7 @@
 
       <br />
       <div class='form-input'>
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= render partial: 'shared/accessible_submit_button',
                    locals: {id: 'update',
                             val: 'Save',
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index 4235b74..a239fe3 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -37,7 +37,7 @@
       <!-- submit buttons -->
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= f.submit _('Save'), class: 'btn btn-primary' %>
         <% if @guidance_group.published == false then %>
           <%= f.submit _('Publish'), name: "save_publish", class: "btn btn-primary" %>
diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb
index 3563060..de8cf5d 100644
--- a/app/views/guidance_groups/admin_new.html.erb
+++ b/app/views/guidance_groups/admin_new.html.erb
@@ -25,7 +25,7 @@
       <!-- submit buttons -->
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= f.submit _('Save'), name: "draft", class: "btn btn-primary" %>
       </div>
     </fieldset>
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb
index 2874554..4701487 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -37,7 +37,7 @@
     
     <br />
     <div class="form-input">
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" value="<%= _('Save')%>" />
     </div>
   </fieldset>
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb
index 7774ab7..51be5f8 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -41,7 +41,7 @@
     
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <input type="submit" id="edit_guidance_submit" href="#edit_guidance_alert_dialog" class="btn btn-primary" value="<%= _('Save')%>" />
       </div>
     </fieldset>
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index ed62b68..6dad332 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -47,7 +47,7 @@
       </div>
       
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= render partial: 'shared/accessible_submit_button',
                    locals: {id: 'save_org_submit', 
                             val: 'Save', 
diff --git a/app/views/phases/admin_add.html.erb b/app/views/phases/admin_add.html.erb
index 9735587..2007449 100644
--- a/app/views/phases/admin_add.html.erb
+++ b/app/views/phases/admin_add.html.erb
@@ -47,7 +47,7 @@
                   
                   <br />
                   <div class="form-input">
-                    <label></label>
+                    <div class="button-spacer">&nbsp;</div>
                     <%= f.submit _('Save'), class: "btn btn-primary" %>
                     <%= link_to _('Cancel'), admin_template_template_path(@template), class: "btn cancel" %>
                   </div>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index d6c92f9..8b63228 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -49,7 +49,7 @@
       <br />
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <input type="submit" class="form-submit" value="<%= _('Save') %>" />
       </div>
     </fieldset>
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 0fff8f5..3419af2 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -26,7 +26,7 @@
 			
       <br />
       <div class="form-input">
-        <label></label>
+        <div class="button-spacer">&nbsp;</div>
         <%= s.submit _('Save'), class: 'btn btn-primary' %>
         <% if section.modifiable %>
           <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id),
diff --git a/app/views/users/_notification_preferences.html.erb b/app/views/users/_notification_preferences.html.erb
index cdcb003..04ee630 100644
--- a/app/views/users/_notification_preferences.html.erb
+++ b/app/views/users/_notification_preferences.html.erb
@@ -47,7 +47,7 @@
 
     <br/>
     <div class='form-input'>
-      <label></label>
+      <div class="button-spacer">&nbsp;</div>
       <%= submit_tag 'Save', class: 'btn btn-primary' %>
     </div>
   <% end %>