From 89ef31bd9e18e9f553e1f896b29ce11824bd5c3a Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 21 May 2019 16:59:08 -0400
Subject: [PATCH 01/10] Added focus to contact dialog with render logic for
 userEmail vs messageSubject [ref #5717]

---
 src/main/webapp/contactFormFragment.xhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 33565e21e8f..88759ee590e 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -8,6 +8,7 @@
     <p:dialog id="contactDialog" header="#{sendFeedbackDialog.getFormHeader()}" widgetVar="contactForm" modal="true">
         <p:fragment>
             <h:form id="emailForm" class="form-horizontal">
+                <p:focus for="#{sendFeedbackDialog.isLoggedIn() ? 'messageSubject' : 'userEmail'}" />
                 <!-- to: Support -->
                 <div class="form-group">
                     <label for="messageTo" class="col-sm-3 control-label">#{bundle['contact.to']}</label>

From 6f9a38bf01a97d39e7739d523a876a548508edbd Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 23 May 2019 16:44:19 -0400
Subject: [PATCH 02/10] Added focus component to popups and changed btn-link
 styles for Cancel btns [ref #5717]

---
 src/main/java/propertyFiles/Bundle.properties |  1 -
 src/main/webapp/contactFormFragment.xhtml     |  6 +-
 src/main/webapp/dashboard-datamove.xhtml      |  5 +-
 src/main/webapp/dashboard-users.xhtml         | 11 +--
 src/main/webapp/dataset-widgets.xhtml         | 12 ++--
 src/main/webapp/dataverse.xhtml               | 70 ++++++++++---------
 src/main/webapp/dataverse_template.xhtml      | 11 +--
 .../webapp/explicitGroup-new-dialog.xhtml     |  3 +-
 .../file-configure-popup-fragment.xhtml       |  2 +-
 .../webapp/file-download-popup-fragment.xhtml |  3 +-
 .../file-request-access-popup-fragment.xhtml  |  2 +-
 src/main/webapp/file.xhtml                    | 18 ++---
 src/main/webapp/harvestclients.xhtml          | 14 ++--
 src/main/webapp/harvestsets.xhtml             |  8 +--
 src/main/webapp/manage-groups.xhtml           |  9 +--
 src/main/webapp/manage-guestbooks.xhtml       |  8 +--
 src/main/webapp/manage-templates.xhtml        | 11 +--
 src/main/webapp/permissions-configure.xhtml   |  1 +
 .../webapp/permissions-manage-files.xhtml     | 17 ++---
 src/main/webapp/permissions-manage.xhtml      |  6 +-
 src/main/webapp/roles-assign.xhtml            | 13 ++--
 src/main/webapp/roles-edit.xhtml              | 51 +++++++-------
 src/main/webapp/search-include-fragment.xhtml |  2 +-
 23 files changed, 140 insertions(+), 144 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 81598c22947..4938c300283 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -569,7 +569,6 @@ dashboard.list_users.removeAll.message.failure=Failed to remove roles for user {
 dashboard.list_users.toggleSuperuser=Edit Superuser Status
 dashboard.list_users.toggleSuperuser.confirmationText.add=Are you sure you want to enable superuser status for user {0}?
 dashboard.list_users.toggleSuperuser.confirmationText.remove=Are you sure you want to disable superuser status for user {0}?
-dashboard.list_users.toggleSuperuser.confirm=Continue
 dashboard.list_users.api.auth.invalid_apikey=The API key is invalid.
 dashboard.list_users.api.auth.not_superuser=Forbidden. You must be a superuser.
 
diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 88759ee590e..6d924b535f4 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -8,7 +8,7 @@
     <p:dialog id="contactDialog" header="#{sendFeedbackDialog.getFormHeader()}" widgetVar="contactForm" modal="true">
         <p:fragment>
             <h:form id="emailForm" class="form-horizontal">
-                <p:focus for="#{sendFeedbackDialog.isLoggedIn() ? 'messageSubject' : 'userEmail'}" />
+                <p:focus for="#{sendFeedbackDialog.isLoggedIn() ? 'messageSubject' : 'userEmail'}"/>
                 <!-- to: Support -->
                 <div class="form-group">
                     <label for="messageTo" class="col-sm-3 control-label">#{bundle['contact.to']}</label>
@@ -72,10 +72,10 @@
                 <!-- send | cancel buttons -->
                 <div class="button-block">
                     <p:commandLink styleClass="btn btn-default" value="#{bundle['contact.send']}"
-                                    update="@form" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('contactForm').hide();" actionListener="#{sendFeedbackDialog.sendMessage}">
+                                   update="@form" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('contactForm').hide();" actionListener="#{sendFeedbackDialog.sendMessage}">
                         <f:param name="DO_VALIDATION" value="true"/>
                     </p:commandLink>
-                    <button type="button" onclick="PF('contactForm').hide()" class="btn btn-default" value="#{bundle.cancel}">
+                    <button type="button" onclick="PF('contactForm').hide()" class="btn btn-link" value="#{bundle.cancel}">
                         #{bundle.cancel}
                     </button>
                 </div>
diff --git a/src/main/webapp/dashboard-datamove.xhtml b/src/main/webapp/dashboard-datamove.xhtml
index 869c1e6130d..dc64e972885 100644
--- a/src/main/webapp/dashboard-datamove.xhtml
+++ b/src/main/webapp/dashboard-datamove.xhtml
@@ -24,6 +24,7 @@
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:define name="body">
                 <h:form id="datamove-form" class="form-horizontal">
+                    <p:focus for="sourceDatasetMenu"/>
                     <div class="col-md-6">
                         <div class="panel panel-default">
                             <div class="panel-heading text-info">#{bundle['dashboard.card.datamove.selectdataset.header']}</div>
@@ -125,7 +126,7 @@
                              prevents the confirm dialog to pop up (client side) if validation fails -->
                             <f:param name="DO_DATAMOVE_VALIDATION" value="true"/>
                         </p:commandLink>
-                        <p:button styleClass="btn btn-default" outcome="dashboard" value="#{bundle['cancel']}">
+                        <p:button styleClass="btn btn-link" outcome="dashboard" value="#{bundle['cancel']}">
                             <!-- dataverse.id resolves to null !
                                  <f:param name="dataverseId" value="#{dataverse.id}" />
                             -->
@@ -139,7 +140,7 @@
                                              onclick="PF('datamoveConfirmation').hide();" 
                                              action="#{DashboardDatamovePage.move()}"
                                              update=":datamove-form:dsPersistentIds,:datamove-form:move" />
-                            <button type="button" class="btn btn-default" value="#{bundle['no']}" 
+                            <button type="button" class="btn btn-link" value="#{bundle['no']}" 
                                     onclick="PF('datamoveConfirmation').hide();">#{bundle.no}</button>
                         </div>
                     </p:dialog>
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index d424da75680..f234ee779a0 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -24,6 +24,7 @@
             <ui:param name="showDataverseHeader" value="false"/>
             <ui:define name="body">
                 <h:form id="dashboardUsersForm">
+                    <p:focus for="searchFiles"/>
                     <div jsf:id="userssHeaderBlock" class="row">
                         <div class="col-xs-6">
                             <div class="input-group">
@@ -99,15 +100,15 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.list_users.toggleSuperuser.confirm']}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['cancel']}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}"  update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.no}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}" update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
                         </div>
                     </p:dialog>
-                    <p:dialog id="removeRolesConfirm" header="#{bundle['dashboard.list_users.tbl_header.roles.removeAll.header']}" widgetVar="removeRolesConfirm">
+                    <p:dialog id="removeRolesConfirm" header="#{bundle['dashboard.list_users.tbl_header.roles.removeAll.header']}" widgetVar="removeRolesConfirm" modal="true" closable="false">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{DashboardUsersPage.confirmRemoveRolesMessage}</p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" update="userTable,:messagePanel" oncomplete="PF('removeRolesConfirm').hide();" action="#{DashboardUsersPage.removeUserRoles()}" />
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.no}" onclick="PF('removeRolesConfirm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" update="userTable,:messagePanel" oncomplete="PF('removeRolesConfirm').hide();" action="#{DashboardUsersPage.removeUserRoles()}"/>
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.no}" onclick="PF('removeRolesConfirm').hide();"/>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 4adaf814f8f..1d7cfbc1787 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -75,18 +75,18 @@
                             </div>
                             <div class="button-block">
                                 <p:commandButton styleClass="btn btn-default" update="@all" value="#{bundle.saveChanges}" action="#{DatasetWidgetsPage.save()}"/>
-                                <p:commandButton styleClass="btn btn-default" update="@all" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
+                                <p:commandLink styleClass="btn btn-link" update="@all" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
                             </div>
 
-                            <p:dialog header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
+                            <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
                                 <p class="help-block">
-                                    <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
+                                    <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
                                 </p>
                                 <div class="button-block">
                                     <p:commandLink value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
                                                    action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
                                                    update="@all"/>
-                                    <button type="button" class="btn btn-default" onclick="PF('confrmRemove').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                    <button type="button" class="btn btn-link" onclick="PF('confrmRemove').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
                                 </div> 
                             </p:dialog>
                             <p:dialog id="selectFileThumbnail" header="#{bundle['dataset.thumbnailsAndWidget.availableThumbnails']}" widgetVar="selectFileThumbnail" modal="true">
@@ -111,13 +111,11 @@
                                 </div>
                                 <div class="button-block">
                                     <p:commandLink styleClass="btn btn-default" update="@all" value="#{bundle.continue}" action="#{DatasetWidgetsPage.setDataFileAsThumbnail()}"/>
-                                    <!-- TODO WIRE THIS BUTTON UP -->
-                                    <button type="button" onclick="PF('selectFileThumbnail').hide()" class="btn btn-default" value="#{bundle.cancel}">
+                                    <button type="button" onclick="PF('selectFileThumbnail').hide()" class="btn btn-link" value="#{bundle.cancel}">
                                         #{bundle.cancel}
                                     </button>
                                 </div>
                             </p:dialog>
-
                         </h:form>
                     </p:tab>
                     <p:tab id="widgetsTab" title="#{bundle['dataset.thumbnailsAndWidget.widgets.title']}">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index b2366e3bd58..fed7d31a398 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -579,55 +579,56 @@
                     <!-- Featured Dataverses Popup -->
                     <p:dialog id="browseOptsForm" header="#{bundle['dataverse.option.featuredDataverse']}" widgetVar="browseOptsForm" modal="true">
                         <ui:fragment rendered="#{!empty DataversePage.featuredDataverses.source or !empty DataversePage.featuredDataverses.target}">
-                        <div class="form-group">
-                            <p class="help-block">#{bundle['dataverse.selectToFeature']}</p>
-                            <p:pickList id="featuredDataverseList" value="#{DataversePage.featuredDataverses}" var="featureddataverse"
-                                        itemLabel="#{featureddataverse.name}"
-                                        itemValue="#{featureddataverse}" converter="dataverseConverter"
-                                        showSourceFilter="true" showTargetFilter="true" />
-                        </div>
-                        <div class="button-block">
-                            <p:commandButton value="#{bundle.saveChanges}" action="#{DataversePage.save}"/>
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
-                        </div>
+                            <p:focus for="featuredDataverseList"/>
+                            <div class="form-group">
+                                <p class="help-block">#{bundle['dataverse.selectToFeature']}</p>
+                                <p:pickList id="featuredDataverseList" value="#{DataversePage.featuredDataverses}" var="featureddataverse"
+                                            itemLabel="#{featureddataverse.name}"
+                                            itemValue="#{featureddataverse}" converter="dataverseConverter"
+                                            showSourceFilter="true" showTargetFilter="true" />
+                            </div>
+                            <div class="button-block">
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.saveChanges}" action="#{DataversePage.save}"/>
+                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
+                            </div>
                         </ui:fragment>
                         <ui:fragment rendered="#{empty DataversePage.featuredDataverses.source and empty DataversePage.featuredDataverses.target}">
-                        <p class="text-danger">
-                            <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.nopublished.tip']}
-                        </p>
-                        <div class="button-block">
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
-                        </div>
+                            <p class="text-danger">
+                                <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.nopublished.tip']}
+                            </p>
+                            <div class="button-block">
+                                <p:commandButton value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
+                            </div>
                         </ui:fragment>
                     </p:dialog>
 
                     <!-- Publish Confirmation Popup -->
-                    <p:dialog header="#{bundle['dataverse.publish.header']}" widgetVar="confirmation" modal="true">
+                    <p:dialog id="publishDvConfirm" header="#{bundle['dataverse.publish.header']}" widgetVar="confirmation" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.publish.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('confirmation').hide()" action="#{DataversePage.releaseDataverse}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('confirmation').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('confirmation').hide()" action="#{DataversePage.releaseDataverse}" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('confirmation').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog header="#{bundle['dataverse.publish.header']}" widgetVar="mayNotRelease" modal="true">
+                    <p:dialog id="mayNotRelease" header="#{bundle['dataverse.publish.header']}" widgetVar="mayNotRelease" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.publish.failed.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('mayNotRelease').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.close}" onclick="PF('mayNotRelease').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog header="#{bundle['dataverse.delete']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteDvConfirm" header="#{bundle['dataverse.delete']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.delete.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DataversePage.deleteDataverse}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DataversePage.deleteDataverse}" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();" type="button" />
                         </div>
                     </p:dialog>
                 </h:form>
@@ -642,6 +643,7 @@
                 <!-- Link Dataverse Popup -->
                 <p:dialog id="linkDataverseForm" header="#{DataversePage.linkMode == 'SAVEDSEARCH' ? bundle['dataverse.savedsearch.link'] : bundle['dataverse.link']}" widgetVar="linkDataverseForm" modal="true">
                     <h:form styleClass="form-horizontal" rendered="#{DataversePage.dataversesForLinking.size() > 1}">
+                        <p:focus for="dvNameSelect"/>
                         <ui:fragment rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}">
                             <p class="help-block">#{bundle['dataverse.link.dataverse.choose']}</p>
                         </ui:fragment>
@@ -655,7 +657,7 @@
                                 </h:outputFormat>
                             </label>
                             <div class="col-sm-7">
-                                <h:selectOneMenu styleClass="form-control" value="#{DataversePage.linkingDataverseId}">
+                                <h:selectOneMenu id="dvNameSelect" styleClass="form-control" value="#{DataversePage.linkingDataverseId}">
                                     <f:selectItems value="#{DataversePage.linkingDVSelectItems}" />
                                 </h:selectOneMenu>
                                 <ui:remove>
@@ -699,11 +701,11 @@
                             </div>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle['dataverse.link.save']}" action="#{DataversePage.saveLinkedDataverse}"
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" action="#{DataversePage.saveLinkedDataverse}"
                                               rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}"/>
-                            <p:commandButton value="#{bundle['dataverse.savedsearch.save']}" action="#{DataversePage.saveSavedSearch}"
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.savedsearch.save']}" action="#{DataversePage.saveSavedSearch}"
                                              rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}"/>
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
                         </div>
                     </h:form>
                     <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 1}">
@@ -721,8 +723,8 @@
                             </div>
                         </div>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle['dataverse.link.save']}" onclick="PF('linkDataverseForm').hide()" actionListener="#{DataversePage.saveLinkedDataverse()}"/>
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" onclick="PF('linkDataverseForm').hide()" actionListener="#{DataversePage.saveLinkedDataverse()}"/>
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
                         </div>
                     </ui:fragment>
                     <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 0}">
@@ -730,7 +732,7 @@
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.link.no.linkable']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
+                            <p:commandButton value="#{bundle.close}" onclick="PF('linkDataverseForm').hide()"/>
                         </div>
                     </ui:fragment>
                 </p:dialog>
@@ -741,8 +743,8 @@
                         <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.resetModifications.text']}
                     </p>
                     <div class="button-block">
-                        <p:commandButton value="#{bundle.continue}" onclick="check();PF('resetModifications').hide()" />
-                        <p:commandButton value="#{bundle.cancel}" onclick="uncheck();PF('resetModifications').hide()" />
+                        <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="check();PF('resetModifications').hide()" />
+                        <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="uncheck();PF('resetModifications').hide()" />
                     </div>
                 </p:dialog>
 
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 612d6bf0107..fd442541f7a 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -78,16 +78,7 @@
                 <!-- DO NOTHING -->
             </f:facet>
         </p:ajaxStatus>
-        <ui:include src="contactFormFragment.xhtml">
-        </ui:include>
-        <p:dialog id="statusInfo" styleClass="smallPopUp" header="#{settingsWrapper.get(':StatusMessageHeader')}" widgetVar="statusInfo" modal="true">
-            <p><h:outputText value="#{settingsWrapper.get(':StatusMessageText')}" escape="false"/></p>
-            <div class="button-block">
-                <button type="button" onclick="PF('statusInfo').hide()" class="btn btn-default" value="#{bundle.close}">
-                    #{bundle.close}
-                </button>
-            </div>
-        </p:dialog>
+        <ui:include src="contactFormFragment.xhtml"></ui:include>
         <script type="text/javascript" defer="defer" src="#{resource['bs/js/bootstrap.min.js']}?version=#{systemConfig.getVersion()}"></script>
         <script type="text/javascript" defer="defer" src="#{resource['js/ie-compat.js']}?version=#{systemConfig.getVersion()}"></script>
         <script type="text/javascript" defer="defer" src="#{resource['js/dv_rebind_bootstrap_ui.js']}?version=#{systemConfig.getVersion()}"></script>
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index a061e29ebd6..9fa4ea992b5 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -5,6 +5,7 @@
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     
     <p:dialog id="explicitGroupNewDialog" width="65%" header="#{bundle['dataverse.permissions.explicitGroupEditDialog.title.new']}" widgetVar="explicitGroupForm" modal="true">
+        <p:focus for="explicitGroupName"/>
         <p:fragment id="explicitGroupNewDialogMessages">
             <div class="container messagePanel">
                 <iqbs:messages collapsible="true" />
@@ -90,7 +91,7 @@
                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('explicitGroupForm').hide();">
                     <f:param name="DO_GROUP_VALIDATION" value="true"/>
                 </p:commandLink>
-                <button type="button" class="btn btn-default" onclick="PF('explicitGroupForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                <button type="button" class="btn btn-link" onclick="PF('explicitGroupForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
             </div>
         </p:fragment>
     </p:dialog>
diff --git a/src/main/webapp/file-configure-popup-fragment.xhtml b/src/main/webapp/file-configure-popup-fragment.xhtml
index 232b8d2dbb2..d369b5ff417 100644
--- a/src/main/webapp/file-configure-popup-fragment.xhtml
+++ b/src/main/webapp/file-configure-popup-fragment.xhtml
@@ -19,6 +19,6 @@
                 onclick="PF('configureToolPopup').hide();"
                 update=":messagePanel">
             </p:commandLink>
-            <button type="button" class="btn btn-default" onclick="PF('configureToolPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            <button type="button" class="btn btn-link" onclick="PF('configureToolPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
         </div>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml
index b514e9a56dc..43652e44054 100644
--- a/src/main/webapp/file-download-popup-fragment.xhtml
+++ b/src/main/webapp/file-download-popup-fragment.xhtml
@@ -10,6 +10,7 @@
 
 
         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+        <p:focus for="guestbookuser_nameText"/>
         <p class="help-block">
             #{bundle['file.downloadDialog.tip']}
         </p>
@@ -182,6 +183,6 @@
                 #{bundle['acceptTerms']}
             </p:commandLink>
             
-            <button type="button" class="btn btn-default" onclick="PF('downloadPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            <button type="button" class="btn btn-link" onclick="PF('downloadPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
         </div>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml
index 573b22fee8b..ef405e01999 100644
--- a/src/main/webapp/file-request-access-popup-fragment.xhtml
+++ b/src/main/webapp/file-request-access-popup-fragment.xhtml
@@ -46,6 +46,6 @@
                            update="@([id$=requestAccessPopupButton])" oncomplete="PF('requestAccessPopup').hide();">
                 #{bundle['acceptTerms']}
             </p:commandLink>
-            <button type="button" class="btn btn-default" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            <button type="button" class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
         </div>
 </ui:composition>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 26e0f766117..d4ed80cc957 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -544,15 +544,15 @@
                         </p:tabView>
                     </div>
 
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
+                    <p:dialog id="deleteFileConfirm" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.immediate']}</p>
                         <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.owner.released}">
                             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').hide()" 
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').hide()" 
                                              action="#{FilePage.deleteFile()}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
                         </div>
                     </p:dialog>
                     <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
@@ -584,8 +584,8 @@
                         </ui:include>
                     </p:dialog>
                     
-                    <p:dialog header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true" 
-                        id="configureToolPopup" styleClass="smallPopUp" rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
+                    <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true" 
+                                rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
                         <ui:include src="file-configure-popup-fragment.xhtml">
                             <ui:param name="externalTools" value="#{FilePage.getExternalTools()}"/>
                             <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
@@ -597,7 +597,7 @@
                     </ui:include>
                     
                     <!-- Request Access Sign Up/Log In Button -->
-                    <p:dialog header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
+                    <p:dialog id="accessGuest" header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-exclamation-sign text-danger"/>&#160;
                             <h:outputFormat styleClass="text-danger" value="#{dataverseHeaderFragment.signupAllowed ? bundle['file.requestAccess.dialog.msg.signup'] : bundle['file.requestAccess.dialog.msg']}" escape="false">
@@ -644,8 +644,8 @@
                                 </div>
                             </div>
                             <div class="button-block">
-                                <p:commandButton value="#{bundle.continue}" onclick="PF('accessPopup').hide();" update=":messagePanel" action="#{FilePage.restrictFile(true)}" />
-                                <p:commandButton value="#{bundle.cancel}" onclick="PF('accessPopup').hide();" type="button" />
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide();" update=":messagePanel" action="#{FilePage.restrictFile(true)}" />
+                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('accessPopup').hide();" type="button" />
                             </div>
                         </ui:fragment>
                     </p:dialog>
@@ -668,7 +668,7 @@
                             <p:commandButton value="#{bundle.close}" onclick="PF('fileAlreadyReplacedPrevious').hide();"/>
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeAccessDeniedPopup" modal="true">
+                    <p:dialog id="computeAccessDenied" styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeAccessDeniedPopup" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.compute.fileAccessDenied']}</p>
                         <div class="button-block">
                             <p:commandButton value="#{bundle.close}" onclick="PF('computeAccessDeniedPopup').hide();" type="button" />
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 18a65f87b8f..86c527682e5 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -165,8 +165,8 @@
                             </h:outputFormat>
                         </p -->
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingClientsPage.deleteClient()}" update=":harvestingClientsForm :messagePanel" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingClientsForm"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingClientsPage.deleteClient()}" update=":harvestingClientsForm :messagePanel" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingClientsForm"/>
                         </div>
                     </p:dialog>
 
@@ -174,8 +174,8 @@
                     <p:dialog id="newHarvestingClientDialog" widgetVar="newHarvestingClientForm"
                               modal="true" width="85%"
                               header="#{harvestingClientsPage.createMode ? bundle['harvestclients.newClientDialog.title.new'] : bundle['harvestclients.viewEditDialog.title']}">
+                        <p:focus for="nickname"/>
                         <p:fragment id="newHarvestingClientDialogContent">
-                            <p:focus context="newHarvestingClientDialogContent"/>
                             <p class="help-block">
                                 <h:outputText value="#{bundle['harvestclients.newClientDialog.help']}"/>
                             </p>
@@ -287,9 +287,9 @@
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
                                         <button type="button"
+                                                class="btn btn-link"
                                                 jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}"
                                                 onclick="PF('newHarvestingClientForm').hide()"
-                                                class="btn btn-default"
                                                 value="#{bundle.cancel}">
                                             #{bundle.cancel}
                                         </button>
@@ -374,7 +374,7 @@
                                             <f:param name="DO_VALIDATION" value="true"/>
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button" onclick="PF('newHarvestingClientForm').hide()" class="btn btn-default" value="#{bundle.cancel}">
+                                        <button type="button" class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
@@ -469,7 +469,7 @@
                                                         action="#{harvestingClientsPage.goToStepFour()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button" onclick="PF('newHarvestingClientForm').hide()" class="btn btn-default" value="#{bundle.cancel}">
+                                        <button type="button" class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
@@ -550,7 +550,7 @@
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.saveClient}"
                                                        oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();"/>
-                                        <button type="button" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" class="btn btn-default" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                        <button type="button" class="btn btn-link" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
                                     </div>
                                 </div>
                             </fieldset>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 12c539b12b5..bf9db5f06b9 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -184,8 +184,8 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingSetsPage.deleteSet()}" update=":harvestingSetsForm :messagePanel" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingSetsForm"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingSetsPage.deleteSet()}" update=":harvestingSetsForm :messagePanel" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingSetsForm"/>
                         </div>
                     </p:dialog>
 
@@ -251,8 +251,8 @@
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
                                         <button type="button" 
+                                                class="btn btn-link" 
                                                 onclick="PF('newOAISetForm').hide()" 
-                                                class="btn btn-default" 
                                                 value="#{bundle.cancel}">
                                             #{bundle.cancel}
                                         </button>
@@ -318,7 +318,7 @@
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.saveSet}"
                                                            oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();"/>
-                                            <button type="button" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" class="btn btn-default" onclick="PF('newOAISetForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                            <button type="button" class="btn btn-link" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" onclick="PF('newOAISetForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
                                         </div>
                                     </div>
                                 </fieldset>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index adf5eebc4c8..ca2ec0cd4e9 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -87,16 +87,17 @@
                             </p:column>
                         </p:dataTable>
                     </div>
-                    <p:dialog rendered="#{manageGroupsPage.showDeletePopup}" header="#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteGroupConfirm" rendered="#{manageGroupsPage.showDeletePopup}" header="#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.unrenderDeletePopup()}" update="@all" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.unrenderDeletePopup()}" update="@all" type="button" />
                         </div>
                     </p:dialog>
                     <p:dialog id="viewGroup" styleClass="largePopUp" header="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.header']}" widgetVar="viewGroup" modal="true">
+                        <p:focus for="addRoleAssigneeName"/>
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label for="select_GroupName" class="col-sm-3 control-label">
@@ -175,7 +176,7 @@
                                            value="#{bundle.saveChanges}"
                                            update="@all">
                             </p:commandLink>
-                            <p:commandButton type="button" styleClass="btn btn-default" value="#{bundle.cancel}" onclick="PF('viewGroup').hide()" />
+                            <p:commandLink type="button" styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('viewGroup').hide()" />
                         </div>
                     </p:dialog>
                     <!-- Explicit Group Edit Popup -->
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 8146b920978..51eae85b71b 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -145,13 +145,13 @@
                         </p:dataTable>
                         </div>
                     </div>
-                    <p:dialog header="#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteGuestbookConfirm" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
                         </div>
                     </p:dialog>
                     <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
@@ -220,7 +220,7 @@
                             </div>
                         </div>
                         <div class="button-block">
-                            <p:commandButton type="button" value="#{bundle.close}" onclick="PF('viewGuestbook').hide()" />
+                            <p:commandButton type="button" styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('viewGuestbook').hide()" />
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index dbbfd31daee..62538d5f532 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -141,9 +141,10 @@
                             </p:column>
                         </p:dataTable>
                     </div>
-                    <p:dialog header="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.header']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteTemplateConfirm" header="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.header']}" 
+                              widgetVar="deleteConfirmation" modal="true" focus="contDeleteTemplateBtn">
                         <p class="help-block">
-                            <span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> &#160;<h:outputText value="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.tip']}" /></span>
+                            <span class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> &#160;<h:outputText value="#{bundle['dataset.manageTemplates.tab.action.btn.delete.dialog.tip']}" /></span>
                         </p>
                         <ui:fragment rendered="#{manageTemplatesPage.selectedTemplate.isDefaultForDataverse}">
                             <p>
@@ -158,8 +159,8 @@
                             </ul>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
+                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
                         </div>
                     </p:dialog>
                     <p:dialog id="viewTemplate" styleClass="largePopUp" header="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.header']}" widgetVar="viewTemplate" modal="true">
@@ -184,7 +185,7 @@
                             <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}" />
                         </ui:include>
                         <div class="button-block">
-                            <p:commandButton type="button" value="#{bundle.close}" onclick="PF('viewTemplate').hide()" />
+                            <p:commandButton type="button" styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('viewTemplate').hide()" />
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/permissions-configure.xhtml b/src/main/webapp/permissions-configure.xhtml
index 3e8f55ba0a6..60bba91f60e 100644
--- a/src/main/webapp/permissions-configure.xhtml
+++ b/src/main/webapp/permissions-configure.xhtml
@@ -6,6 +6,7 @@
      xmlns:p="http://primefaces.org/ui"
      xmlns:o="http://omnifaces.org/ui">
     
+    <p:focus for="authenticatedUsersContributorRoleRadio"/>
     <div class="form-group">
         <label for="accessRadios">
             #{bundle['dataverse.permissions.Q1']}
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 5023f14d50a..0a2e2264805 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -200,7 +200,7 @@
                         </div>
                     </div>
                     <!-- View / Remove Users/Groups Popup -->
-                    <p:dialog id="viewRemoveDialog" width="65%" header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.header']}" widgetVar="viewRemoveWidget" modal="true">
+                    <p:dialog id="viewRemoveDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.header']}" widgetVar="viewRemoveWidget" modal="true">
                         <div>
                             <p:outputPanel id="selectionRemoveCounter">
                                 <p>
@@ -236,11 +236,12 @@
                                 <span class="glyphicon glyphicon-remove"/>
                                 <h:outputText value="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}"/>
                             </p:commandLink>
-                            <button type="button" class="btn btn-default" onclick="PF('viewRemoveWidget').hide()" value="Cancel">#{bundle.cancel}</button>
+                            <button type="button" class="btn btn-link" onclick="PF('viewRemoveWidget').hide()" value="Cancel">#{bundle.cancel}</button>
                         </div>
                     </p:dialog>
                     <!-- Assign Users/Groups Popup -->
-                    <p:dialog id="assignDialog" width="65%" header="#{bundle['dataverse.permissionsFiles.assignDialog.header']}" widgetVar="assignWidget" modal="true">
+                    <p:dialog id="assignDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissionsFiles.assignDialog.header']}" widgetVar="assignWidget" modal="true">
+                        <p:focus for="userGroupNameAssign"/>
                         <p:fragment id="assignMessages">
                             <div class="messagePanel">
                                 <iqbs:messages collapsible="true" />
@@ -335,21 +336,21 @@
                                     <span class="glyphicon glyphicon-ban-circle"/>
                                     <h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}"/>
                                 </p:commandLink>
-                                <button type="button" class="btn btn-default" onclick="PF('assignWidget').hide()" value="Cancel">#{bundle.cancel}</button>
+                                <button type="button" class="btn btn-link" onclick="PF('assignWidget').hide()" value="Cancel">#{bundle.cancel}</button>
                             </div>
                         </p:fragment>
                     </p:dialog>
-                    <p:dialog header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}" widgetVar="confirmation" modal="true">
+                    <p:dialog id="accessFileRemoveConfirm" header="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}" widgetVar="confirmation" modal="true">
                         <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation']}</span>
+                            <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('confirmation').hide()"
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('confirmation').hide()"
                                              action="#{manageFilePermissionsPage.removeRoleAssignments()}"
                                              process="@this"
                                              update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
                                              oncomplete="PF('viewRemoveWidget').hide();"/>
-                            <p:commandButton type="button" value="#{bundle.cancel}" onclick="PF('confirmation').hide()" />
+                            <p:commandLink type="button" styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('confirmation').hide()" />
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index b912f457ae1..e65380f5aaf 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -208,7 +208,7 @@
                                            update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} @([id$=assignedRoles]) assignedRoles @([id$=Messages])"
                                            actionListener="#{managePermissionsPage.saveConfiguration}"
                                            oncomplete="PF('accessForm').hide()"/>
-                            <button type="button" class="btn btn-default" onclick="PF('accessForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                            <button type="button" class="btn btn-link" onclick="PF('accessForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
                         </div>
                     </p:dialog>
 
@@ -217,7 +217,7 @@
                     <!-- Roles Edit Popup -->
                     <ui:include src="roles-edit.xhtml"/>
                     
-                    <p:dialog header="#{bundle['dataverse.permissions.usersOrGroups.removeBtn']}" widgetVar="confirmation" modal="true">
+                    <p:dialog id="accessRemoveConfirm" header="#{bundle['dataverse.permissions.usersOrGroups.removeBtn']}" widgetVar="confirmation" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-warning-sign text-danger"/> <span class="text-danger">#{bundle['dataverse.permissions.usersOrGroups.removeBtn.confirmation']}</span>
                         </p>
@@ -225,7 +225,7 @@
                             <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmation').hide()" 
                                              action="#{managePermissionsPage.removeRoleAssignment()}" 
                                              update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} assignedRoles @([id$=Messages])" />
-                            <button type="button" class="btn btn-default" onclick="PF('confirmation').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                            <button type="button" class="btn btn-link" onclick="PF('confirmation').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index 078c8be747d..435878064c0 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -6,6 +6,7 @@
     xmlns:jsf="http://xmlns.jcp.org/jsf"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     <p:dialog id="userGroupDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.header']}" widgetVar="userGroupsForm" modal="true">
+        <p:focus for="userGroupNameAssign"/>
         <p:fragment id="assignRoleMessages">
             <div class="container messagePanel">
                 <iqbs:messages collapsible="true" />
@@ -50,7 +51,7 @@
                         #{bundle['dataverse.permissions.usersOrGroups.tabHeader.role']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                     </label>
                     <div class="col-sm-10 form-group">
-                        <div class="col-sm-4">
+                        <div class="col-sm-5">
                             <p:fragment id="availableRoles">
                                 <p:selectOneRadio id="assignRoleRadios" layout="pageDirection"
                                                   value="#{managePermissionsPage.selectedRoleId}"
@@ -62,7 +63,7 @@
                                 <p:message for="assignRoleRadios" display="text"/>
                             </p:fragment>
                         </div>
-                        <div class="col-sm-8 bg-muted">
+                        <div class="col-sm-7 bg-muted">
                             <p:fragment id="roleDetails">
                                 <div id="assignRolePermissionLabels">
                                     <p class="help-block">#{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.description']}</p>
@@ -75,8 +76,8 @@
                                             </ui:repeat>
                                         </div>
                                         <p class="help-block">
-                                            <span class="glyphicon glyphicon-warning-sign text-danger"/>
-                                            <h:outputFormat styleClass="text-danger" value=" #{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.warning']}">
+                                            <span class="glyphicon glyphicon-warning-sign text-warning"/>
+                                            <h:outputFormat styleClass="text-warning" value=" #{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.warning']}">
                                                 <f:param value="#{managePermissionsPage.assignedRole.name}"/>
                                                 <f:param value="#{managePermissionsPage.assignedRoleObjectTypes}"/>
                                                 <f:param value="#{managePermissionsPage.definitionLevelString}"/>
@@ -96,7 +97,7 @@
                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('userGroupsForm').hide();">
                     <f:param name="DO_ASSIGN_VALIDATION" value="true"/>
                 </p:commandLink>
-                <button type="button" class="btn btn-default" onclick="PF('userGroupsForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                <button type="button" class="btn btn-link" onclick="PF('userGroupsForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
             </div>
         </p:fragment>
     </p:dialog>
@@ -111,7 +112,7 @@
             <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmFileDownloader').hide()"
                              action="#{managePermissionsPage.assignRole}"
                              update="assignRoleContent assignedRoles @([id$=Messages])" />
-            <button type="button" class="btn btn-default" onclick="PF('confirmFileDownloader').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            <button type="button" class="btn btn-link" onclick="PF('confirmFileDownloader').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
         </div>
     </p:dialog>
 </ui:composition>
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 4f02e163ae6..358943842f9 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -6,47 +6,44 @@
     <p:dialog id="rolesPermissionsDialog" header="#{bundle['dataverse.permissions.roles.header']}" widgetVar="roleForm" modal="true" styleClass="largePopUp"> 
         <p:panel id="editRolePanel" styleClass="panelLayoutBlock" widgetVar="editRole">
             <p:panel id="editRolePropertiesPanel" styleClass="panelLayoutBlock" widgetVar="roleProperties">
+                <p:focus for="roleName"/>
                 <div class="row form-horizontal">
-                    <div class="col-xs-6 form-group">
-                        <label class="col-sm-3 control-label" for="roleName">
+                    <div class="col-sm-6 form-group">
+                        <label class="control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.name']}
                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.name.title']}"></span>
                         </label>
-                        <div class="col-sm-9">
-                            <p:panelGrid columns="2" styleClass="noBorders">
-                                <p:inputText id="roleName" value="#{managePermissionsPage.role.name}"/>
-                                <p:message for="roleName"/>
-                            </p:panelGrid>
-                        </div>
+                        <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
+                            <p:inputText id="roleName" styleClass="form-control" value="#{managePermissionsPage.role.name}"/>
+                            <p:message for="roleName"/>
+                        </p:panelGrid>
                     </div>
-                    <div class="col-xs-6 form-group">
-                        <label class="col-sm-3 control-label" for="roleName">
+                    <div class="col-sm-6 form-group">
+                        <label class="control-label" for="roleName">
                             #{bundle['dataverse.permissions.roles.id']}
                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.id.title']}"></span>
                         </label>
-                        <div class="col-sm-9">
-                            <p:panelGrid columns="2" styleClass="noBorders">
-                                <p:inputText id="roleAlias" value="#{managePermissionsPage.role.alias}"/>
-                                <p:message for="roleAlias"/>
-                            </p:panelGrid>
-                        </div>
+                        <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
+                            <p:inputText id="roleAlias" styleClass="form-control" value="#{managePermissionsPage.role.alias}"/>
+                            <p:message for="roleAlias"/>
+                        </p:panelGrid>
                     </div>
-                    <div class="col-xs-6 form-group">
-                        <label class="col-sm-3 control-label" for="roleName">
+                </div>
+                <div class="row form-horizontal">
+                    <div class="col-sm-6 form-group">
+                        <label class="control-label" for="roleName">
                            #{bundle.description}
                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                   data-toggle="tooltip" data-placement="auto right" data-container="body" data-original-title="#{bundle['dataverse.permissions.roles.description.title']}"></span>
                         </label>
-                        <div class="col-sm-9">
-                            <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
-                                <h:panelGroup>
-                                    <p:inputText id="roleDescription" styleClass="form-control" value="#{managePermissionsPage.role.description}"/>
-                                </h:panelGroup>
-                                <p:message for="roleDescription"/>
-                            </p:panelGrid>
-                        </div>
+                        <p:panelGrid columns="2" styleClass="noBorders" style="width:100%;">
+                            <h:panelGroup>
+                                <p:inputText id="roleDescription" styleClass="form-control" value="#{managePermissionsPage.role.description}"/>
+                            </h:panelGroup>
+                            <p:message for="roleDescription"/>
+                        </p:panelGrid>
                     </div>
                 </div>
             </p:panel>
@@ -71,7 +68,7 @@
                                oncomplete="PF('roleForm').hide()"
                                update="roleDisplay availableRoles @([id$=Messages])"
                                actionListener="#{managePermissionsPage.updateRole}"/>
-                <button type="button" class="btn btn-default" onclick="PF('roleForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                <button type="button" class="btn btn-link" onclick="PF('roleForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
             </div>
         </p:panel>
     </p:dialog>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index c07fd77ff7b..b3a013f2791 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -653,7 +653,7 @@
                          actionListener="#{SearchIncludeFragment.setDisplayCardValues()}" />
     </h:form>
 
-    <p:dialog header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
+    <p:dialog id="addDataGuest" header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
         <p class="help-block">
             <h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
         </p>

From da31a1a97485147303a7deda9ee807cdaaab5dbb Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 29 May 2019 14:50:51 -0400
Subject: [PATCH 03/10] Additionally added focus component to popups and
 changed btn-link styles for Cancel btns [ref #5717]

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |   9 +-
 src/main/java/propertyFiles/Bundle.properties |   7 +-
 src/main/webapp/dataset.xhtml                 | 127 +++++++++---------
 src/main/webapp/editFilesFragment.xhtml       |  35 ++---
 .../file-configure-dropdown-fragment.xhtml    |   2 +-
 .../webapp/provenance-popups-fragment.xhtml   |   7 +-
 6 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 5ad47fba204..16c4ff60b14 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1573,7 +1573,8 @@ private String init(boolean initFull) {
             }
             
             if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){
-                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"), 
+                        BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
             }
 
             resetVersionUI();
@@ -1585,7 +1586,8 @@ private String init(boolean initFull) {
         try {
             privateUrl = commandEngine.submit(new GetPrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
             if (privateUrl != null) {
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"), 
+                        BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
             }
         } catch (CommandException ex) {
             // No big deal. The user simply doesn't have access to create or delete a Private URL.
@@ -1593,7 +1595,8 @@ private String init(boolean initFull) {
         if (session.getUser() instanceof PrivateUrlUser) {
             PrivateUrlUser privateUrlUser = (PrivateUrlUser) session.getUser();
             if (dataset != null && dataset.getId().equals(privateUrlUser.getDatasetId())) {
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer"));
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.privateurl.header"), 
+                        BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer"));
             }
         }
                 
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 4938c300283..4904c5ef363 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1338,7 +1338,8 @@ dataset.message.deleteFailure=This dataset draft could not be deleted.
 dataset.message.deaccessionFailure=This dataset could not be deaccessioned.
 dataset.message.createFailure=The dataset could not be created.
 dataset.message.termsFailure=The dataset terms could not be updated.
-dataset.message.publicInstall=File Access - Files are stored on a publicly accessible storage server.
+dataset.message.label.fileAccess=File Access
+dataset.message.publicInstall=Files are stored on a publicly accessible storage server.
 dataset.metadata.publicationDate=Publication Date
 dataset.metadata.publicationDate.tip=The publication date of a dataset.
 dataset.metadata.publicationYear=Publication Year
@@ -1371,8 +1372,8 @@ dataset.noValidSelectedFilesForDownload=The restricted file(s) selected may not
 dataset.mixedSelectedFilesForDownload=The restricted file(s) selected may not be downloaded because you have not been granted access.
 dataset.downloadUnrestricted=Click Continue to download the files you have access to download.
 dataset.requestAccessToRestrictedFiles=You may request access to the restricted file(s) by clicking the Request Access button. 
-dataset.privateurl.infoMessageAuthor=Unpublished Dataset Private URL - Privately share this dataset before it is published: {0}
-dataset.privateurl.infoMessageReviewer=Unpublished Dataset Private URL - This unpublished dataset is being privately shared. You will not be able to access it when logged into your Dataverse account.
+dataset.privateurl.infoMessageAuthor=Privately share this dataset before it is published: {0}
+dataset.privateurl.infoMessageReviewer=This unpublished dataset is being privately shared. You will not be able to access it when logged into your Dataverse account.
 dataset.privateurl.header=Unpublished Dataset Private URL
 dataset.privateurl.tip=Use a Private URL to allow those without Dataverse accounts to access your unpublished dataset. For more information about the Private URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-for-reviewing-an-unpublished-dataset" title="Private URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
 dataset.privateurl.absent=Private URL has not been created.
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 779cf02edb3..7446aec8cce 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -678,16 +678,16 @@
                     <p:blockUI block="datasetForm" widgetVar="blockDatasetForm"/>
 
                     <!-- Popups -->
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadInvalid" modal="true">
+                    <p:dialog id="downloadInvalid" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadInvalid" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noValidSelectedFilesForDownload']}</p>
                         <ui:fragment rendered="#{DatasetPage.dataset.fileAccessRequest}">
                             <p class="help-block">#{bundle['dataset.requestAccessToRestrictedFiles']}</p>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('downloadInvalid').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('downloadInvalid').hide();" type="button" />
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadMixed" modal="true">
+                    <p:dialog id="downloadMixed" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadMixed" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.mixedSelectedFilesForDownload']}</p>
                         <table>
                             <ui:repeat var="resFile" value="#{DatasetPage.selectedNonDownloadableFiles}" >
@@ -699,27 +699,27 @@
                         <div class="button-block">
                             <p class="help-block">#{bundle['dataset.downloadUnrestricted']}</p>
                             <ui:fragment rendered="#{!DatasetPage.downloadPopupRequired}">
-                                <p:commandButton value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" action="#{DatasetPage.startMultipleFileDownload()}" />
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" action="#{DatasetPage.startMultipleFileDownload()}" />
                             </ui:fragment>
                             <ui:fragment rendered="#{DatasetPage.downloadPopupRequired and !settingsWrapper.rsyncDownload}">
-                                <p:commandButton value="#{bundle.continue}" onclick="PF('downloadMixed').hide()"
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()"
                                                  action="#{DatasetPage.openDownloadPopupForMultipleFileDownload()}" update="@form" />
                             </ui:fragment>
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('downloadMixed').hide();" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('downloadMixed').hide();" type="button" />
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['file.deleteDialog.header']}" widgetVar="deleteConfirmation" modal="true">
+                    <p:dialog id="deleteConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteDialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteDialog.tip']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DatasetPage.deleteDataset()}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DatasetPage.deleteDataset()}" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['file.deleteDraftDialog.header']}" widgetVar="deleteVersionConfirmation" modal="true">
+                    <p:dialog id="deleteVersionConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteDraftDialog.header']}" widgetVar="deleteVersionConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteDraftDialog.tip']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteVersionConfirmation').hide()" action="#{DatasetPage.deleteDatasetVersion()}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteVersionConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteVersionConfirmation').hide()" action="#{DatasetPage.deleteDatasetVersion()}" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteVersionConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
                     <p:dialog id="privateUrlId" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="privateUrlConfirmation" modal="true">
@@ -755,37 +755,38 @@
                         <p:fragment id="privateUrlPanelCannotCreate" rendered="#{!DatasetPage.userCanCreatePrivateURL}">
                             <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.privateurl.cannotCreate']}</p>
                             <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.cancel}" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
                             </div>
                         </p:fragment>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="disablePrivateUrlConfirmation" modal="true" closable="false">
+                    <p:dialog id="disablePrivateUrlConfirmation" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="disablePrivateUrlConfirmation" modal="true" closable="false">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.privateurl.disableConfirmationText']}</p>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrlConfirm']}" action="#{DatasetPage.disablePrivateUrl()}" update="privateUrlPanel,:messagePanel" onclick="PF('disablePrivateUrlConfirmation').hide();"/>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.cancel}" onclick="PF('disablePrivateUrlConfirmation').hide();PF('privateUrlConfirmation').show();" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('disablePrivateUrlConfirmation').hide();PF('privateUrlConfirmation').show();" type="button" />
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteSelectedFileConfirmation" modal="true">
+                    <p:dialog id="deleteSelectedFileConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteSelectedFileConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.multiple.immediate']}</p>
                         <ui:fragment rendered="#{DatasetPage.dataset.released}">
                             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle['file.delete']}" onclick="PF('deleteSelectedFileConfirmation').hide()"
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteSelectedFileConfirmation').hide()"
                                              action="#{DatasetPage.deleteFilesAndSave()}" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteSelectedFileConfirmation').hide();
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteSelectedFileConfirmation').hide();
                                     PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
-                    <p:dialog styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeInvalid" modal="true">
+                    <p:dialog id="computeInvalid" styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeInvalid" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.compute.computeBatchRestricted']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('computeInvalid').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('computeInvalid').hide();" type="button" />
                         </div>
                     </p:dialog>
                     <p:outputPanel autoUpdate="true">
-                        <p:dialog rendered="#{DatasetPage.renderDeaccessionPopup}" id="deaccessionBlock" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionBlock" modal="true" visible="#{facesContext.validationFailed}">
+                        <p:dialog id="deaccessionBlock" rendered="#{DatasetPage.renderDeaccessionPopup}" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionBlock" modal="true" visible="#{facesContext.validationFailed}">
+                            <p:focus for="selectVersionChk"/>
                             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.tip']}</p>
                             <div class="form-group" jsf:rendered="#{DatasetPage.releasedVersionTabList.size() > 1}">
 
@@ -836,7 +837,7 @@
                                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('deaccessionConfirmation').show();">
                                     <f:param name="DO_DEACCESSION_VALIDATION" value="true"/>
                                 </p:commandLink>
-                                <p:commandLink type="button" styleClass="btn btn-default" immediate ="true" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();"/>
+                                <p:commandLink type="button" styleClass="btn btn-link" immediate ="true" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();"/>
                             </div>
                         </p:dialog>
                     </p:outputPanel>
@@ -845,7 +846,7 @@
                         <div class="button-block">
                             <h:commandButton styleClass="btn btn-default" value="#{bundle.yes}" onclick="PF('deaccessionConfirmation').hide();
                                     PF('deaccessionBlock').hide()" action="#{DatasetPage.deaccessionVersions}" />
-                            <button type="button" class="btn btn-default" value="No" onclick="PF('deaccessionConfirmation').hide()">#{bundle.no}</button>
+                            <button type="button" class="btn btn-link" value="No" onclick="PF('deaccessionConfirmation').hide()">#{bundle.no}</button>
                         </div>
                     </p:dialog>
                     <p:dialog id="deaccessionAllConfirmation" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionAllConfirmation" modal="true">
@@ -854,7 +855,7 @@
                             <h:commandButton styleClass="btn btn-default" value="Yes" onclick="PF('deaccessionAllConfirmation').hide();
                                     PF('deaccessionBlock').hide();
                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.deaccessionVersions}" />
-                            <button type="button" class="btn btn-default" value="No" onclick="PF('deaccessionAllConfirmation').hide();
+                            <button type="button" class="btn btn-link" value="No" onclick="PF('deaccessionAllConfirmation').hide();
                                     PF('blockDatasetForm').hide();">#{bundle.no}</button>
                         </div>
                     </p:dialog>
@@ -1074,6 +1075,7 @@
                     <!-- p:remoteCommand  name="openEditFilesPageCommand" action=" {DatasetPage.editFileMetadata()}"  / -->
 
                     <p:dialog id="fileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="fileTagsPopup" modal="true">
+                        <p:focus for="fileTagsMenuDS"/>
                         <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
                         <div class="form-horizontal" jsf:rendered="#{!(empty DatasetPage.selectedFiles)}">
                             <div class="form-group text-left">
@@ -1159,11 +1161,11 @@
                         </div>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" id="fileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileTagsPopup').hide()" update=":datasetForm:tabView:filesTable, :datasetForm" action="#{DatasetPage.saveFileTagsAndCategories()}"/>
-                            <p:commandButton styleClass="btn btn-default" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
+                            <p:commandLink styleClass="btn btn-link" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
                         </div>
                     </p:dialog>
                     <!-- Request Access Sign Up/Log In Button -->
-                    <p:dialog header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
+                    <p:dialog id="accessSignUpLogIn" header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
                             <span class="glyphicon glyphicon-warning-sign text-danger"/>&#160;
                             <h:outputFormat styleClass="text-danger" value="#{dataverseHeaderFragment.signupAllowed ? bundle['file.requestAccess.dialog.msg.signup'] : bundle['file.requestAccess.dialog.msg']}" escape="false">
@@ -1178,16 +1180,11 @@
                         </div>
                     </p:dialog>
                     <!-- END: Request Access Sign Up/Log In Button -->
-                    
-                    <p:dialog header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true" 
-                            id="configureToolPopup" styleClass="smallPopUp">
-
-                            <ui:include src="file-configure-popup-fragment.xhtml">
-                                <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                            </ui:include>
-
+                    <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true">
+                        <ui:include src="file-configure-popup-fragment.xhtml">
+                            <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
+                        </ui:include>
                     </p:dialog>
-                    
                     <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
                         <ui:include src="file-download-popup-fragment.xhtml">
@@ -1208,7 +1205,6 @@
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
-
                     <p:dialog id="requestAccessPopup" styleClass="largePopUp" header="#{bundle['file.requestAccess']}" widgetVar="requestAccessPopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
                         <ui:include src="file-request-access-popup-fragment.xhtml">
@@ -1216,9 +1212,7 @@
                             <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
-
                     </p:dialog>
-
                     <p:dialog id="downloadDataSubsetPopup" styleClass="smallPopUp" header="#{bundle['file.download.subset.header']}" widgetVar="downloadDataSubsetPopup"
                               rendered="#{empty DatasetPage.editMode}" modal="true">
                         <div class="form-inline clearfix" jsf:rendered="#{!(empty DatasetPage.guestbookResponse.dataFile) and DatasetPage.guestbookResponse.dataFile.tabularData}">
@@ -1227,7 +1221,8 @@
                             </ui:include>
                         </div>
                     </p:dialog>
-                        <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link']}" widgetVar="linkDatasetForm" modal="true" >
+                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link']}" widgetVar="linkDatasetForm" modal="true">
+                        <p:focus for="dataverseLinkName"/>
                         <div class="form-horizontal">
                             <p class="help-block">
                                 <h:outputFormat value="#{bundle['dataverse.link.dataset.choose']}" escape="false">
@@ -1280,7 +1275,7 @@
                                            value="#{bundle['dataset.link.save']}">  
                                 <f:param name="DO_DS_LINK_VALIDATION" value="true"/>
                              </p:commandLink>
-                            <button type="button" class="btn btn-default"  onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();">                              
+                            <button type="button" class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();">                              
                                 #{bundle.cancel}
                             </button>
                         </div>
@@ -1312,12 +1307,13 @@
                             <h:outputLink styleClass="btn btn-default" value="#{DatasetPage.cartComputeUrl}" onclick="PF('computeBatchListPopup').hide()" target="_blank">
                                 <h:outputText value="#{bundle['dataset.compute.computeBatchCompute']}"/>
                             </h:outputLink>
-                            <h:commandButton styleClass="btn btn-default" value="#{bundle.cancel}" onclick="PF('computeBatchListPopup').hide();" type="button" />
+                            <h:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('computeBatchListPopup').hide();" type="button" />
                         </div>
                     </p:dialog>
 
                     <p:dialog id="accessPopup" header="#{bundle['dataset.access.accessHeader']}"  widgetVar="accessPopup" modal="true">
                         <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE' or empty DatasetPage.editMode }">
+                            <p:focus for="termsAccessInput"/>
                             <div class="form-horizontal">
                                 <div class="form-group">
                                     <label for="metadata_TermsAccess" class="col-sm-3 control-label">
@@ -1326,7 +1322,7 @@
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
-                                        <p:inputTextarea value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
+                                        <p:inputTextarea id="termsAccessInput" value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -1343,12 +1339,12 @@
                             </div>
                             <div class="button-block">
                                 <ui:fragment rendered="#{DatasetPage.editMode != 'CREATE'}">
-                                    <p:commandButton value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.restrictSelectedFiles(true)}" />
+                                    <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.restrictSelectedFiles(true)}" />
                                 </ui:fragment>
                                 <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
-                                    <p:commandButton value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.save()}" />
+                                    <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.save()}" />
                                 </ui:fragment>
-                                <p:commandButton value="#{bundle.cancel}" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button" />
+                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button" />
                             </div>
                         </ui:fragment>
                     </p:dialog>
@@ -1358,14 +1354,14 @@
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.submitMessage']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.submit}" onclick="PF('inreview').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.submit}" onclick="PF('inreview').hide();
                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.submitDataset}" immediate="true"  />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
                         </div>
                     </p:dialog>
 
                     <!-- Publish/Submit for Review Dialogs -->
-                    <p:dialog width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishConfirm" modal="true">
+                    <p:dialog id="publishConfirm" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishConfirm" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.publish.tip']}
                         </p>
@@ -1373,13 +1369,13 @@
                             <h:outputText value="#{DatasetPage.datasetPublishCustomText}" escape="false"/>
                         </div>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('publishConfirm').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('publishConfirm').hide();
                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" immediate="true"  />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishParent" modal="true">
+                    <p:dialog id="publishParent" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishParent" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/>
                             <h:outputFormat value="#{bundle['dataset.mayNotPublish.both']}" escape="false">
@@ -1397,13 +1393,14 @@
                             #{bundle['dataset.publishBoth.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle['dataset.mayNotBePublished.both.button']}" onclick="PF('publishParent').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.mayNotBePublished.both.button']}" onclick="PF('publishParent').hide();
                                     PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseParentDVAndDataset}" immediate="true"  />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
                         </div>
                     </p:dialog>
 
-                    <p:dialog width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="releaseDraft" modal="true">
+                    <p:dialog id="releaseDraft" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="releaseDraft" modal="true">
+                        <p:focus for="options"/>
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.republish.tip']}
                         </p>
@@ -1428,14 +1425,14 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}" action="#{DatasetPage.releaseDraft}" />
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('releaseDraft').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}" action="#{DatasetPage.releaseDraft}" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('releaseDraft').hide();
                                     PF('blockDatasetForm').hide();" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}" action="#{DatasetPage.releaseMajor}" immediate="true" />
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog header="#{bundle['dataset.publish.header']}" widgetVar="mayNotRelease" modal="true">
+                    <p:dialog id="mayNotRelease" header="#{bundle['dataset.publish.header']}" widgetVar="mayNotRelease" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/>
                             <h:outputFormat value="#{bundle['dataset.mayNotPublish.administrator']}" escape="false">
@@ -1447,12 +1444,12 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('mayNotRelease').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('mayNotRelease').hide();
                                     PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true">
+                    <p:dialog id="maynotPublishParent" header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/>
                             <h:outputFormat value="#{bundle['dataset.mayNotPublish.twoGenerations']}" escape="false">
@@ -1469,12 +1466,12 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('maynotPublishParent').hide();
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('maynotPublishParent').hide();
                                     PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
 
-                    <p:dialog header="#{bundle['dataset.rejectBtn']}" widgetVar="sendBackToContributor" modal="true">
+                    <p:dialog id="sendBackToContributor" header="#{bundle['dataset.rejectBtn']}" widgetVar="sendBackToContributor" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.rejectMessage']}
                         </p>
@@ -1489,11 +1486,11 @@
                         </ui:remove>
 
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}" />
                             <ui:remove>
-                            <p:commandButton value="#{bundle.continue}" onclick="testReturnReason();"  />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="testReturnReason();"  />
                             </ui:remove>
-                            <p:commandButton value="#{bundle.cancel}" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button" />
                         </div>
                     </p:dialog>
                     <p:remoteCommand name="returnToAuthorCommand"   action="#{DatasetPage.sendBackToContributor}"/>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index a2db4bff7e9..4fdda8bd86c 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -515,33 +515,31 @@
     <!-- TODO: a message panel informing the unauthorized, or unauthenticated user that they don't have permission - should it be here? L.A. 4.2 -->
 
     <!-- Popups -->
-    <p:dialog styleClass="smallPopUp" header="#{bundle['file.addreplace.content_type.header']}" widgetVar="fileTypeDifferentPopup" id="fileTypeDifferentPopup" modal="true">
+    <p:dialog id="fileTypeDifferentPopup" styleClass="smallPopUp" header="#{bundle['file.addreplace.content_type.header']}" widgetVar="fileTypeDifferentPopup" modal="true">
         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{EditDatafilesPage.warningMessageForPopUp}</p>
         <div class="button-block">
-            <p:commandButton value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" 
+            <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" 
                              action="#{EditDatafilesPage.deleteFiles()}"
                              update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage"/>
-            <p:commandButton value="#{bundle.continue}" onclick="PF('fileTypeDifferentPopup').hide()" type="button" />
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('fileTypeDifferentPopup').hide()" type="button" />
         </div>
     </p:dialog>
-    
     <p:dialog id="selectFilesForDeleteFragment" styleClass="smallPopUp"
               header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDeleteFragment" modal ="true">
         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDelete']}</p>
         <div class="button-block">
-            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForDeleteFragment').hide();"/>
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('selectFilesForDeleteFragment').hide();"/>
         </div>
     </p:dialog>
-    
-    <p:dialog styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
+    <p:dialog id="deleteFileConfirmDialog" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.tip']}</p>
         <ui:fragment rendered="#{EditDatafilesPage.dataset.released}">
             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
         </ui:fragment>
         <div class="button-block">
-            <p:commandButton value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
                              update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
-            <p:commandButton value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
+            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
         </div>
     </p:dialog>
     <p:dialog id="editFileAccessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="editFileAccessPopup" modal="true">
@@ -588,6 +586,7 @@
         </div>
     </p:dialog>
     <p:dialog id="fileAdvancedOptions" styleClass="dialog-submenu smallPopUp" header="#{bundle['file.advancedIngestOptions']}" widgetVar="fileAdvancedOptions" modal="true">
+        <p:focus for="spssSavEncodingLanguage"/>
         <div class="form-horizontal">
             <!-- select text encoding, for SPSS-SAV (and, and possibly, other) (this option is only available during ingest) data files; not implemented yet -->
             <div class="form-group" jsf:rendered="#{!(empty EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup) and (empty EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup.id) and dataFileServiceBean.isSpssSavFile(EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup.dataFile)}">
@@ -764,11 +763,13 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
-            <p:commandButton id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>        </div>
+            <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
+            <p:commandLink styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
+        </div>
     </p:dialog>
     <!-- end of "advanced options" dialogue -->
     <p:dialog id="fileSetThumbnail" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileSetThumbnail" modal="true">
+        <p:focus for="datasetThumbnailImage"/>
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="datasetThumbnailImage" class="col-sm-4 control-label">
@@ -783,8 +784,8 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
-            <p:commandButton id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
+            <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
+            <p:commandLink styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
         </div>
     </p:dialog>
     <p:dialog id="fileThumbnailConfirm" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileThumbnailConfirm" modal="true">
@@ -794,14 +795,14 @@
             </p>
         </div>
         <div class="button-block">
-            <p:commandButton id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
-            <p:commandButton id="fileThumbnailConfirmCancelBtn" value="#{bundle.cancel}" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();"/>
+            <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
+            <p:commandLink styleClass="btn btn-link" id="fileThumbnailConfirmCancelBtn" value="#{bundle.cancel}" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();"/>
         </div>
     </p:dialog>
     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml"/>
     <p:dialog id="editFileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="editFileTagsPopup" modal="true">
+        <p:focus for="fileTagsMenu"/>
         <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
-
         <div class="form-horizontal" jsf:rendered="#{!(empty EditDatafilesPage.fileMetadataSelectedForTagsPopup)}">
             <div class="form-group text-left">
                 <label for="selectedTagsListEFF" class="col-sm-4 control-label">
@@ -882,7 +883,7 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide()" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
-            <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();"  update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
+            <p:commandLink styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
         </div>
     </p:dialog>
     <script type="text/javascript" src="/resources/js/dropins.js" id="dropboxjs" data-app-key="#{EditDatafilesPage.dropBoxKey}"/>
diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml
index 9a5bd19506e..b26f04d0314 100644
--- a/src/main/webapp/file-configure-dropdown-fragment.xhtml
+++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml
@@ -40,7 +40,7 @@
         
         <!-- Configure popup MOVED TO file configure popup fragment -->
 
-          <p:dialog header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true" rendered="#{(worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
+          <p:dialog id="mapDataDialog" header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true" rendered="#{(worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
               <p class="help-block">
                   <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
               </p>
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml
index dc19b5e90de..fb7a2148f69 100644
--- a/src/main/webapp/provenance-popups-fragment.xhtml
+++ b/src/main/webapp/provenance-popups-fragment.xhtml
@@ -135,9 +135,8 @@
                 </div>
             </div>
             <div class="button-block">              
-                <p:commandButton styleClass="btn btn-default" id="editProvenancePopupSaveButton" value="#{bundle.continue}" disabled="#{provPopupFragmentBean.isDataFilePublishedWithDraftRendering() and !provPopupFragmentBean.isDatasetInDraftRendering()}" update="provPopupOutput,assignMessages,confirmProvenancePopup" oncomplete="if (args &amp;&amp; !args.validationFailed) { PF('editProvenancePopup').hide();PF('confirmProvenancePopup').show(); }" />
-                <p:commandButton styleClass="btn btn-default" id="editProvenancePopupCancelButton" value="#{bundle.cancel}" update="provPopupOutput,assignMessages,confirmProvenancePopup" onclick="PF('editProvenancePopup').hide();" immediate="true" actionListener="#{provPopupFragmentBean.removeJsonAndRelatedData()}">
-                </p:commandButton>
+                <p:commandButton styleClass="btn btn-default" id="editProvenancePopupSaveButton" value="#{bundle.continue}" disabled="#{provPopupFragmentBean.isDataFilePublishedWithDraftRendering() and !provPopupFragmentBean.isDatasetInDraftRendering()}" update="provPopupOutput,assignMessages,confirmProvenancePopup" oncomplete="if (args &amp;&amp; !args.validationFailed) { PF('editProvenancePopup').hide();PF('confirmProvenancePopup').show();}"/>
+                <p:commandLink styleClass="btn btn-link" id="editProvenancePopupCancelButton" value="#{bundle.cancel}" update="provPopupOutput,assignMessages,confirmProvenancePopup" onclick="PF('editProvenancePopup').hide();" immediate="true" actionListener="#{provPopupFragmentBean.removeJsonAndRelatedData()}"/>
             </div>
         </div>
     </p:dialog>
@@ -174,7 +173,7 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();" action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
-            <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupCancelButton" value="#{bundle.cancel}" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();"/>
+            <p:commandLink styleClass="btn btn-link" id="confirmProvenancePopupCancelButton" value="#{bundle.cancel}" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();"/>
         </div>
     </p:dialog>
 </ui:composition>

From a91e137a9b226b57efdaba816a2130496f5fe919 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 3 Jun 2019 13:12:37 -0400
Subject: [PATCH 04/10] More focus and secondary btn styling changes plus misc
 clean up [ref #5717]

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |   3 +-
 .../passwordreset/PasswordResetPage.java      |   4 +-
 src/main/java/propertyFiles/Bundle.properties |  41 +--
 src/main/webapp/404.xhtml                     |  19 +-
 src/main/webapp/WEB-INF/web.xml               |   4 +
 src/main/webapp/contactFormFragment.xhtml     |   8 +-
 src/main/webapp/dashboard-datamove.xhtml      |  13 +-
 src/main/webapp/dashboard-users.xhtml         |  13 +-
 src/main/webapp/dataset-license-terms.xhtml   |  15 +-
 src/main/webapp/dataset-versions.xhtml        |   2 +-
 src/main/webapp/dataset-widgets.xhtml         |  24 +-
 src/main/webapp/dataset.xhtml                 | 293 ++++++++++--------
 src/main/webapp/dataverse.xhtml               |  54 ++--
 src/main/webapp/dataverse_header.xhtml        |   3 +-
 src/main/webapp/dataverseuser.xhtml           |   9 +-
 src/main/webapp/editFilesFragment.xhtml       |  65 ++--
 src/main/webapp/editdatafiles.xhtml           |  39 +--
 .../webapp/explicitGroup-new-dialog.xhtml     |   8 +-
 .../file-configure-popup-fragment.xhtml       |   9 +-
 .../file-download-button-fragment.xhtml       |  32 +-
 .../webapp/file-download-popup-fragment.xhtml |  46 ++-
 .../file-request-access-popup-fragment.xhtml  |   9 +-
 src/main/webapp/file-versions.xhtml           |   6 +-
 src/main/webapp/file.xhtml                    | 105 ++++---
 src/main/webapp/filesFragment.xhtml           |  10 +-
 src/main/webapp/guestbook.xhtml               |   7 +-
 src/main/webapp/harvestclients.xhtml          |  41 ++-
 src/main/webapp/harvestsets.xhtml             |  36 +--
 src/main/webapp/manage-groups.xhtml           |  25 +-
 src/main/webapp/manage-guestbooks.xhtml       |  24 +-
 src/main/webapp/manage-templates.xhtml        |  22 +-
 src/main/webapp/oauth2/convert.xhtml          |   6 +-
 src/main/webapp/oauth2/firstLogin.xhtml       |   1 +
 src/main/webapp/passwordreset.xhtml           |  22 +-
 .../webapp/permissions-manage-files.xhtml     |  36 ++-
 src/main/webapp/permissions-manage.xhtml      |  18 +-
 .../webapp/provenance-popups-fragment.xhtml   |   6 +-
 src/main/webapp/resources/css/structure.css   |   4 +
 src/main/webapp/roles-assign.xhtml            |  12 +-
 src/main/webapp/roles-edit.xhtml              |   6 +-
 src/main/webapp/search-include-fragment.xhtml |   2 +-
 src/main/webapp/template.xhtml                |  26 +-
 src/main/webapp/themeAndWidgetsFragment.xhtml |   9 +-
 43 files changed, 622 insertions(+), 515 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 16c4ff60b14..437ecfe85db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -4468,7 +4468,8 @@ public void createPrivateUrl() {
         try {
             PrivateUrl createdPrivateUrl = commandEngine.submit(new CreatePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
             privateUrl = createdPrivateUrl;
-            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
+                    BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
             privateUrlWasJustCreated = true;
         } catch (CommandException ex) {
             String msg = BundleUtil.getStringFromBundle("dataset.privateurl.noPermToCreate", PrivateUrlUtil.getRequiredPermissions(ex));
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
index d2637df040e..450374d6e66 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
@@ -24,6 +24,7 @@
 import javax.inject.Named;
 
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import javax.faces.component.UIComponent;
@@ -127,7 +128,8 @@ public String sendPasswordResetLink() {
                  */
                 logger.log(Level.INFO, "Couldn''t find single account using {0}", emailAddress);
             }
-            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), ""));
+            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), 
+                    BundleUtil.getStringFromBundle("passwdReset.successSubmit.tip", Arrays.asList(emailAddress))));
         } catch (PasswordResetException ex) {
             /**
              * @todo do we really need a special exception for this??
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 4904c5ef363..31266f70f06 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -237,27 +237,27 @@ user.newPassword=New Password
 authenticationProvidersAvailable.tip={0}There are no active authentication providers{1}If you are a system administrator, please enable one using the API.{2}If you are not a system administrator, please contact the one for your institution.
 
 passwdVal.passwdReq.title=Your password must contain:
-passwdVal.passwdReq.goodStrength =passwords of at least {0} characters are exempt from all other requirements
-passwdVal.passwdReq.lengthReq =At least {0} characters 
-passwdVal.passwdReq.characteristicsReq =At least 1 character from {0} of the following types:
-passwdVal.passwdReq.notInclude =It may not include:
-passwdVal.passwdReq.consecutiveDigits =More than {0} numbers in a row
-passwdVal.passwdReq.dictionaryWords =Dictionary words
-passwdVal.passwdReq.unknownPasswordRule =Unknown, contact your administrator
+passwdVal.passwdReq.goodStrength=passwords of at least {0} characters are exempt from all other requirements
+passwdVal.passwdReq.lengthReq=At least {0} characters 
+passwdVal.passwdReq.characteristicsReq=At least 1 character from {0} of the following types:
+passwdVal.passwdReq.notInclude=It may not include:
+passwdVal.passwdReq.consecutiveDigits=More than {0} numbers in a row
+passwdVal.passwdReq.dictionaryWords=Dictionary words
+passwdVal.passwdReq.unknownPasswordRule=Unknown, contact your administrator
 #printf syntax used to pass to passay library
-passwdVal.expireRule.errorCode =EXPIRED
-passwdVal.expireRule.errorMsg =The password is over %1$s days old and has expired.
-passwdVal.goodStrengthRule.errorMsg =Note: passwords are always valid with a %1$s or more character length regardless.
-passwdVal.goodStrengthRule.errorCode =NO_GOODSTRENGTH
-passwdVal.passwdReset.resetLinkTitle =Password Reset Link
-passwdVal.passwdReset.resetLinkDesc =Your password reset link is not valid
+passwdVal.expireRule.errorCode=EXPIRED
+passwdVal.expireRule.errorMsg=The password is over %1$s days old and has expired.
+passwdVal.goodStrengthRule.errorMsg=Note: passwords are always valid with a %1$s or more character length regardless.
+passwdVal.goodStrengthRule.errorCode=NO_GOODSTRENGTH
+passwdVal.passwdReset.resetLinkTitle=Password Reset Link
+passwdVal.passwdReset.resetLinkDesc=Your password reset link is not valid
 passwdVal.passwdReset.resetInitiated=Password Reset Initiated
-passwdVal.passwdReset.valBlankLog =new password is blank
-passwdVal.passwdReset.valFacesError =Password Error
-passwdVal.passwdReset.valFacesErrorDesc =Please enter a new password for your account.
-passwdVal.passwdValBean.warnDictionaryRead =Dictionary was set, but none was read in.
-passwdVal.passwdValBean.warnDictionaryObj =PwDictionaries not set and no default password file found:
-passwdVal.passwdValBean.warnSetStrength =The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2}
+passwdVal.passwdReset.valBlankLog=new password is blank
+passwdVal.passwdReset.valFacesError=Password Error
+passwdVal.passwdReset.valFacesErrorDesc=Please enter a new password for your account.
+passwdVal.passwdValBean.warnDictionaryRead=Dictionary was set, but none was read in.
+passwdVal.passwdValBean.warnDictionaryObj=PwDictionaries not set and no default password file found:
+passwdVal.passwdValBean.warnSetStrength=The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2}
 
 #loginpage.xhtml
 login.System=Login System
@@ -810,6 +810,7 @@ dataverse.results.dialog.addDataGuest.login.title=Log into your Dataverse Accoun
 dataverse.results.types.dataverses=Dataverses
 dataverse.results.types.datasets=Datasets
 dataverse.results.types.files=Files
+dataverse.results.btn.filterResults=Filter Results
 # Bundle file editors, please note that "dataverse.results.empty.zero" is used in a unit test
 dataverse.results.empty.zero=There are no dataverses, datasets, or files that match your search. Please try a new search by using other or broader terms. You can also check out the <a href="{0}/{1}/user/find-use-data.html" title="Finding &amp; Using Data - Dataverse User Guide" target="_blank">search guide</a> for tips.
 # Bundle file editors, please note that "dataverse.results.empty.hidden" is used in a unit test
@@ -2127,7 +2128,7 @@ permission.roleNotAbleToBeAssigned=The role was not able to be assigned.
 
 #ManageGroupsPage.java
 dataverse.manageGroups.create.success=Successfully created group {0}. Refresh to update your page.
-dataverse.manageGroups.save.success=Successfully saved group {0}
+dataverse.manageGroups.save.success=Successfully saved group {0}.
 dataverse.manageGroups.delete=The group has been deleted.
 dataverse.manageGroups.nodelete=The explicit group cannot be deleted.
 dataverse.manageGroups.create.fail=Group Creation failed.
diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml
index 97a61759d31..8bedf3e65f9 100644
--- a/src/main/webapp/404.xhtml
+++ b/src/main/webapp/404.xhtml
@@ -31,13 +31,20 @@
                         </h:outputFormat>   
                     </o:form>                  
                 </div>                   
-                <div class="row text-center" jsf:rendered="#{!widgetWrapper.widgetView}">
+                <div class="row" jsf:rendered="#{!widgetWrapper.widgetView}" style="margin-top:3em;">
                     <o:form useRequestURI="true">
-                        <input id="search404" type="text" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all" size="28" value="" placeholder="#{bundle['header.search.title']}"
-                               style="font-size:1em;margin-right:1em;" onkeypress="if (event.keyCode == 13) {window.location = '/?q=' + document.getElementById('search404').value; return false;}" />
-                        <a href="#" id="search404button" class="btn btn-default" onclick="window.location = '/?q=' + document.getElementById('search404').value; return false;">
-                            <span class="glyphicon glyphicon-search"/> #{bundle.find}
-                        </a>
+                        <p:focus for="search404"/>
+                        <div class="col-sm-6 col-sm-offset-3">
+                            <div class="input-group">
+                                <input jsf:id="search404" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}"
+                                       style="font-size:1em;" onkeypress="if (event.keyCode == 13) {window.location = '/?q=' + document.getElementById('search404').value; return false;}"/>
+                                <span class="input-group-btn">
+                                    <button id="search404button" class="btn btn-default" onclick="window.location = '/?q=' + document.getElementById('search404').value; return false;" type="button">
+                                        <span class="glyphicon glyphicon-search"/> #{bundle.find}
+                                    </button>
+                                </span>
+                            </div>
+                        </div>
                     </o:form>
                 </div>
             </ui:define>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ff617a9fad0..41a82a71952 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -162,6 +162,10 @@
         <extension>svg</extension>
         <mime-type>image/svg+xml</mime-type>
     </mime-mapping>
+    <mime-mapping>
+        <extension>webmanifest</extension>
+        <mime-type>application/manifest+json</mime-type>
+    </mime-mapping>
     <!-- BEGIN Data Deposit API (SWORD v2) -->
     <!-- See also SwordConfigurationImpl for how deprecation warnings are configured -->
     <context-param>
diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 6d924b535f4..04300983572 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -8,7 +8,7 @@
     <p:dialog id="contactDialog" header="#{sendFeedbackDialog.getFormHeader()}" widgetVar="contactForm" modal="true">
         <p:fragment>
             <h:form id="emailForm" class="form-horizontal">
-                <p:focus for="#{sendFeedbackDialog.isLoggedIn() ? 'messageSubject' : 'userEmail'}"/>
+                <p:focus context="contactDialog"/>
                 <!-- to: Support -->
                 <div class="form-group">
                     <label for="messageTo" class="col-sm-3 control-label">#{bundle['contact.to']}</label>
@@ -71,11 +71,11 @@
                 </div>
                 <!-- send | cancel buttons -->
                 <div class="button-block">
-                    <p:commandLink styleClass="btn btn-default" value="#{bundle['contact.send']}"
+                    <p:commandButton styleClass="btn btn-default" value="#{bundle['contact.send']}"
                                    update="@form" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('contactForm').hide();" actionListener="#{sendFeedbackDialog.sendMessage}">
                         <f:param name="DO_VALIDATION" value="true"/>
-                    </p:commandLink>
-                    <button type="button" onclick="PF('contactForm').hide()" class="btn btn-link" value="#{bundle.cancel}">
+                    </p:commandButton>
+                    <button class="btn btn-link" onclick="PF('contactForm').hide()" type="button">
                         #{bundle.cancel}
                     </button>
                 </div>
diff --git a/src/main/webapp/dashboard-datamove.xhtml b/src/main/webapp/dashboard-datamove.xhtml
index dc64e972885..aa6a7a93a5c 100644
--- a/src/main/webapp/dashboard-datamove.xhtml
+++ b/src/main/webapp/dashboard-datamove.xhtml
@@ -117,7 +117,7 @@
                     </div>
 
                     <div class="col-sm-12 button-block">
-                        <p:commandLink id="move" styleClass="btn btn-default" 
+                        <p:commandButton id="move" styleClass="btn btn-default" 
                                        value="#{bundle['saveChanges']}"
                                        update="datamove-form"
                                        validateClient="true"
@@ -125,7 +125,7 @@
                             <!-- if (args &amp;&amp; !args.validationFailed) 
                              prevents the confirm dialog to pop up (client side) if validation fails -->
                             <f:param name="DO_DATAMOVE_VALIDATION" value="true"/>
-                        </p:commandLink>
+                        </p:commandButton>
                         <p:button styleClass="btn btn-link" outcome="dashboard" value="#{bundle['cancel']}">
                             <!-- dataverse.id resolves to null !
                                  <f:param name="dataverseId" value="#{dataverse.id}" />
@@ -136,12 +136,13 @@
                     <p:dialog id="datamoveConfirmation" header="#{bundle['dashboard.card.datamove.manage']}" widgetVar="datamoveConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dashboard.card.datamove.confirm.dialog']}</p>
                         <div class="button-block">
-                            <h:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.card.datamove.confirm.yes']}"
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dashboard.card.datamove.confirm.yes']}"
                                              onclick="PF('datamoveConfirmation').hide();" 
                                              action="#{DashboardDatamovePage.move()}"
-                                             update=":datamove-form:dsPersistentIds,:datamove-form:move" />
-                            <button type="button" class="btn btn-link" value="#{bundle['no']}" 
-                                    onclick="PF('datamoveConfirmation').hide();">#{bundle.no}</button>
+                                             update="@form,:messagePanel" partialSubmit="true"/>
+                            <button class="btn btn-link" onclick="PF('datamoveConfirmation').hide();" type="button">
+                                #{bundle.no}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index f234ee779a0..764ecb3252c 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -4,6 +4,7 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
+      xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
     <h:head>
@@ -71,8 +72,7 @@
                             <p:commandButton id="removeRolesButton" 
                                             rendered="#{!empty user.roles}" 
                                             value="#{bundle['dashboard.list_users.tbl_header.roles.removeAll']}" 
-                                            styleClass="btn btn-default" 
-                                            type="button">
+                                            styleClass="btn btn-default">
                                 <p:ajax event="click" 
                                         oncomplete="PF('removeRolesConfirm').show();"
                                         process="@this" 
@@ -91,6 +91,7 @@
                         </p:column>
                     </p:dataTable>
                     <p:dialog styleClass="smallPopUp" id="toggleSuperuserConfirmation" header="#{bundle['dashboard.list_users.toggleSuperuser']}" widgetVar="toggleSuperuserConfirmation" modal="true" closable="false">
+                        <p:focus context="toggleSuperuserConfirmation"/>
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/>
                             <h:outputFormat value=" #{bundle['dashboard.list_users.toggleSuperuser.confirmationText.add']} " rendered="#{DashboardUsersPage.selectedUserDetached.superuser}">
                                 <f:param value="#{DashboardUsersPage.selectedUserDetached.userIdentifier}"/>
@@ -100,15 +101,17 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.no}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}" update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandButton tabindex="1" styleClass="btn btn-default" value="#{bundle.yes}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandButton tabindex="1" styleClass="btn btn-link" value="#{bundle.no}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}" update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
                         </div>
                     </p:dialog>
                     <p:dialog id="removeRolesConfirm" header="#{bundle['dashboard.list_users.tbl_header.roles.removeAll.header']}" widgetVar="removeRolesConfirm" modal="true" closable="false">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{DashboardUsersPage.confirmRemoveRolesMessage}</p>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" update="userTable,:messagePanel" oncomplete="PF('removeRolesConfirm').hide();" action="#{DashboardUsersPage.removeUserRoles()}"/>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.no}" onclick="PF('removeRolesConfirm').hide();"/>
+                            <button class="btn btn-link" onclick="PF('removeRolesConfirm').hide()" type="button">
+                                #{bundle.no}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index fe30d68cedb..f76bf27cad9 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -10,7 +10,7 @@
    <div class="text-right margin-bottom" 
         jsf:rendered="#{dataverseSession.user.authenticated and empty editMode and !widgetWrapper.widgetView
                         and permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset)}">
-       <p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
+       <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('LICENSE')}" 
                       update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" disabled="#{DatasetPage.lockedFromEdits}">
            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
            <span class="glyphicon glyphicon-briefcase"/> #{bundle['file.dataFilesTab.terms.editTermsBtn']}
@@ -477,7 +477,7 @@
                                    <div class="panel panel-default">
                                        <div class="panel-body">
                                            <p class="form-control-static pull-left">#{DatasetPage.dataset.guestbook.name}</p>
-                                           <p:commandLink type="button" styleClass="btn btn-default pull-right"
+                                           <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(DatasetPage.dataset.guestbook)}"
                                                           update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
@@ -498,19 +498,20 @@
                                </ui:fragment>
 
                                <ui:fragment rendered="#{!empty DatasetPage.dataset.dataverseContext.availableGuestbooks}">
-                                   <p:commandButton value="#{bundle['file.dataFilesTab.terms.list.guestbook.clearBtn']}" 
+                                   <p:commandButton styleClass="btn btn-default"
+                                                    value="#{bundle['file.dataFilesTab.terms.list.guestbook.clearBtn']}" 
                                                     rendered="#{!empty DatasetPage.dataset.guestbook}"
                                                     update="guestbookTable" process="@this" actionListener="#{DatasetPage.reset}"/>
                                    <p:dataTable id="guestbookTable" styleClass="headerless-table margin-top"
                                                 value="#{DatasetPage.dataset.dataverseContext.availableGuestbooks}" var="guestbook" widgetVar="guestbookTable"
                                                 rendered="#{!empty DatasetPage.dataset.dataverseContext.availableGuestbooks}"
                                                 rowIndexVar="rowNum" selection="#{DatasetPage.dataset.guestbook}" rowKey="#{guestbook}">
-                                       <p:column  selectionMode="single" class="col-select-width text-center" rendered="true"  />
+                                       <p:column selectionMode="single" class="col-select-width text-center"/>
                                        <p:column>
                                            <p class="form-control-static pull-left">
-                                               <h:outputText value="#{guestbook.name}" />
+                                               <h:outputText value="#{guestbook.name}"/>
                                            </p>
-                                           <p:commandLink type="button" styleClass="btn btn-default pull-right"
+                                           <p:commandButton styleClass="btn btn-default pull-right"
                                                           value="#{bundle['file.dataFilesTab.terms.list.guestbook.viewBtn']}"
                                                           action="#{DatasetPage.viewSelectedGuestbook(guestbook)}"
                                                           update=":datasetForm" oncomplete="PF('viewGuestbook').show();bind_bsui_components();"/>
@@ -586,7 +587,7 @@
             </div>
         </div>
         <div class="button-block">
-            <button type="button" onclick="PF('viewGuestbook').hide()" class="btn btn-default" value="#{bundle.close}">
+            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
                 #{bundle.close}
             </button>
         </div>
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index 492e9c17dc3..308a59e35ed 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -34,7 +34,7 @@
            update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}"
            actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
     <div class="text-right margin-bottom">
-        <p:commandLink type="button" styleClass="btn btn-default" onclick="testCheckBoxes();"
+        <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
                          rendered="#{DatasetPage.compareVersionsCount > 2}">
             <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
         </p:commandLink>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 1d7cfbc1787..f706710d012 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -45,7 +45,9 @@
                                         <span class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></span>
                                         <p:commandButton update="@all" value="#{bundle.remove}" action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null and DatasetWidgetsPage.datasetThumbnail.fromDataFile != true}" oncomplete="bind_bsui_components();"/>
                                         <div jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail.fromDataFile == true}">
-                                            <button type="button" class="btn btn-default" onclick="PF('confrmRemove').show()">#{bundle.remove}</button>
+                                            <button class="btn btn-default" onclick="PF('confrmRemove').show()" type="button">
+                                                #{bundle.remove}
+                                            </button>
                                         </div>
                                     </div>
                                     <div class="col-sm-8">
@@ -56,7 +58,9 @@
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectAvailable.title']}"></span>
                                             </label>
                                             <div>
-                                                <button type="button" class="btn btn-default" onclick="PF('selectFileThumbnail').show()">#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectThumbnail']}</button>
+                                                <button class="btn btn-default" onclick="PF('selectFileThumbnail').show()" type="button">
+                                                    #{bundle['dataset.thumbnailsAndWidget.thumbnailImage.selectThumbnail']}
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="form-group">
@@ -74,8 +78,8 @@
                                 </div>
                             </div>
                             <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" update="@all" value="#{bundle.saveChanges}" action="#{DatasetWidgetsPage.save()}"/>
-                                <p:commandLink styleClass="btn btn-link" update="@all" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
+                                <p:commandButton styleClass="btn btn-default" update="@form" value="#{bundle.saveChanges}" action="#{DatasetWidgetsPage.save()}"/>
+                                <p:commandButton styleClass="btn btn-link" update="@form" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
                             </div>
 
                             <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
@@ -83,10 +87,12 @@
                                     <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
                                 </p>
                                 <div class="button-block">
-                                    <p:commandLink value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
+                                    <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
                                                    action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
-                                                   update="@all"/>
-                                    <button type="button" class="btn btn-link" onclick="PF('confrmRemove').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                                   update="@form"/>
+                                    <button class="btn btn-link" onclick="PF('confrmRemove').hide()" type="button">
+                                        #{bundle.cancel}
+                                    </button>
                                 </div> 
                             </p:dialog>
                             <p:dialog id="selectFileThumbnail" header="#{bundle['dataset.thumbnailsAndWidget.availableThumbnails']}" widgetVar="selectFileThumbnail" modal="true">
@@ -110,8 +116,8 @@
                                     </div>
                                 </div>
                                 <div class="button-block">
-                                    <p:commandLink styleClass="btn btn-default" update="@all" value="#{bundle.continue}" action="#{DatasetWidgetsPage.setDataFileAsThumbnail()}"/>
-                                    <button type="button" onclick="PF('selectFileThumbnail').hide()" class="btn btn-link" value="#{bundle.cancel}">
+                                    <p:commandButton styleClass="btn btn-default" update="@form" value="#{bundle.continue}" action="#{DatasetWidgetsPage.setDataFileAsThumbnail()}"/>
+                                    <button class="btn btn-link" onclick="PF('selectFileThumbnail').hide()" type="button">
                                         #{bundle.cancel}
                                     </button>
                                 </div>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 7446aec8cce..5a8a33001cb 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -135,28 +135,28 @@
                                                             and DatasetPage.canUpdateDataset()
                                                             and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
                                     <!-- Publish Buttons -->
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
+                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
                                                    rendered="#{!DatasetPage.dataset.released
                                                                and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
                                         <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                     </p:commandLink>
 
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
+                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
                                                    rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
                                         <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                     </p:commandLink>
 
                                     <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
+                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
                                                    rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
                                                                and !DatasetPage.canPublishDataverse()}">
                                         <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                     </p:commandLink>
 
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
+                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
                                                    rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
                                                                and DatasetPage.canPublishDataverse()
                                                                and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
@@ -164,7 +164,7 @@
                                         <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                     </p:commandLink>
 
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
+                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
                                                    rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
                                                                and DatasetPage.canPublishDataverse()
                                                                and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
@@ -175,7 +175,7 @@
                                     <!-- END: Publish Buttons -->
 
                                     <!-- Return to Author Button -->
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview)                                                                                                           
+                                    <p:commandLink styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview)                                                                                                           
                                                                                                           ? 'disabled' : ''}" onclick="PF('sendBackToContributor').show()"
                                                    rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
@@ -199,7 +199,7 @@
                                 <!-- END: Publish/Submit for Review/Return to Author Button Group -->
                                 
                                 <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
-                                               type="button" styleClass="btn btn-default btn-access"                                              
+                                               styleClass="btn btn-default btn-access"                                              
                                                oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
                                                update="linkDatasetForm">
                                     <span class="glyphicon glyphicon-link"/> #{bundle['link']}
@@ -321,7 +321,7 @@
                                 <div id="sharrre-widget" data-url="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
 
                                 <div class="button-block">
-                                    <button type="button" onclick="PF('shareDialog').hide()" class="btn btn-default" value="#{bundle.close}">
+                                    <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                         #{bundle.close}
                                     </button>
                                 </div>
@@ -450,6 +450,7 @@
 
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
+                        <!--<p:focus context="datasetForm"/>-->
                         <div class="form-group">
                             <label for="select_HostDataverse" class="col-sm-2 control-label">
                                 #{bundle.hostDataverse}
@@ -510,8 +511,8 @@
 
                     <!-- Edit editMode -->
                     <div class="button-block form-top" jsf:rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE'}">
-                        <p:commandButton id="saveTop" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();" />
-                        <p:commandButton id="cancelTop" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
+                        <p:commandButton id="saveTop" styleClass="btn btn-default" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
+                        <p:commandButton id="cancelTop" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                     </div>
@@ -608,14 +609,14 @@
                                              and (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
 
                                 <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DatasetPage.editMode}">
-                                    <p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" 
+                                    <p:commandLink styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:bind_bsui_components();" 
                                                    disabled="#{DatasetPage.locked}" rendered="#{!widgetWrapper.widgetView and (DatasetPage.sessionUserAuthenticated and empty DatasetPage.editMode and !widgetWrapper.widgetView
                                                                and DatasetPage.canUpdateDataset() and !DatasetPage.dataset.deaccessioned)}">
-                                        <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                        <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0"/>
                                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
-                                    </p:commandLink>                                   
-                                    <div class="btn-group" jsf:rendered="#{DatasetPage.dataset.released and !DatasetPage.dataset.deaccessioned}" >
-                                        <button class="btn btn-default btn-export dropdown-toggle" type="button" styleClass="btn btn-default" data-toggle="dropdown">
+                                    </p:commandLink>
+                                    <div class="btn-group" jsf:rendered="#{DatasetPage.dataset.released and !DatasetPage.dataset.deaccessioned}">
+                                        <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
                                         <ul class="dropdown-menu" role="menu">
                                             <ui:repeat var="exporter" value="#{DatasetPage.exporters}">
@@ -662,16 +663,16 @@
 
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
-                        <p:commandButton tabindex="1000" id="save" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();" />
-                        <p:commandButton tabindex="1000" id="cancel" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
+                        <p:commandButton id="save" styleClass="btn btn-default" tabindex="1000" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
+                        <p:commandButton id="cancel" styleClass="btn btn-link" tabindex="1000" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
-                        <p:button id="cancelCreate" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}" />
+                        <p:button id="cancelCreate" styleClass="btn btn-link" tabindex="1000" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>
                         <p:commandButton value="Direct" id="datasetSave"
                                          style="display:none"
                                          update=":datasetForm,:messagePanel"
                                          oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
-                                         action="#{DatasetPage.save}" />
+                                         action="#{DatasetPage.save}"/>
                     </div>
                     <!-- END: Create/Save Dataset Button Panel -->
 
@@ -684,7 +685,9 @@
                             <p class="help-block">#{bundle['dataset.requestAccessToRestrictedFiles']}</p>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('downloadInvalid').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('downloadInvalid').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="downloadMixed" styleClass="smallPopUp" header="#{bundle['dataset.inValidSelectedFilesForDownload']}" widgetVar="downloadMixed" modal="true">
@@ -698,28 +701,33 @@
                         </table>
                         <div class="button-block">
                             <p class="help-block">#{bundle['dataset.downloadUnrestricted']}</p>
-                            <ui:fragment rendered="#{!DatasetPage.downloadPopupRequired}">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" action="#{DatasetPage.startMultipleFileDownload()}" />
-                            </ui:fragment>
-                            <ui:fragment rendered="#{DatasetPage.downloadPopupRequired and !settingsWrapper.rsyncDownload}">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()"
-                                                 action="#{DatasetPage.openDownloadPopupForMultipleFileDownload()}" update="@form" />
-                            </ui:fragment>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('downloadMixed').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()" 
+                                             rendered="#{!DatasetPage.downloadPopupRequired}"
+                                             action="#{DatasetPage.startMultipleFileDownload()}"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('downloadMixed').hide()"
+                                             rendered="#{DatasetPage.downloadPopupRequired and !settingsWrapper.rsyncDownload}"
+                                             action="#{DatasetPage.openDownloadPopupForMultipleFileDownload()}" update="@form"/>
+                            <button class="btn btn-link" onclick="PF('downloadMixed').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="deleteConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteDialog.header']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteDialog.tip']}</p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DatasetPage.deleteDataset()}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DatasetPage.deleteDataset()}"/>
+                            <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="deleteVersionConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteDraftDialog.header']}" widgetVar="deleteVersionConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteDraftDialog.tip']}</p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteVersionConfirmation').hide()" action="#{DatasetPage.deleteDatasetVersion()}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteVersionConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteVersionConfirmation').hide()" action="#{DatasetPage.deleteDatasetVersion()}"/>
+                            <button class="btn btn-link" onclick="PF('deleteVersionConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="privateUrlId" styleClass="smallPopUp" header="#{bundle['dataset.privateurl.header']}" widgetVar="privateUrlConfirmation" modal="true">
@@ -747,15 +755,19 @@
                                 </div>
                             </div>
                             <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.createPrivateUrl']}" action="#{DatasetPage.createPrivateUrl()}" update="privateUrlPanel,:messagePanel" rendered="#{empty(DatasetPage.privateUrl)}" />
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.createPrivateUrl']}" action="#{DatasetPage.createPrivateUrl()}" update="privateUrlPanel,:messagePanel" rendered="#{empty(DatasetPage.privateUrl)}"/>
                                 <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrl']}" action="#{DatasetPage.setPrivateUrlJustCreatedToFalse()}" onclick="PF('privateUrlConfirmation').hide();PF('disablePrivateUrlConfirmation').show()" rendered="#{!empty(DatasetPage.privateUrl)}" update="privateUrlPanel"/>
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" update="privateUrlPanel"/>
+                                <button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                    #{bundle.close}
+                                </button>
                             </div>
                         </p:fragment>
                         <p:fragment id="privateUrlPanelCannotCreate" rendered="#{!DatasetPage.userCanCreatePrivateURL}">
                             <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.privateurl.cannotCreate']}</p>
                             <div class="button-block">
-                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button" />
+                                <button class="btn btn-link" onclick="PF('privateUrlConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                    #{bundle.cancel}
+                                </button>
                             </div>
                         </p:fragment>
                     </p:dialog>
@@ -763,7 +775,9 @@
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.privateurl.disableConfirmationText']}</p>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.privateurl.disablePrivateUrlConfirm']}" action="#{DatasetPage.disablePrivateUrl()}" update="privateUrlPanel,:messagePanel" onclick="PF('disablePrivateUrlConfirmation').hide();"/>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('disablePrivateUrlConfirmation').hide();PF('privateUrlConfirmation').show();" type="button" />
+                            <button class="btn btn-link" onclick="PF('disablePrivateUrlConfirmation').hide();PF('privateUrlConfirmation').show();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="deleteSelectedFileConfirmation" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteSelectedFileConfirmation" modal="true">
@@ -774,14 +788,17 @@
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteSelectedFileConfirmation').hide()"
                                              action="#{DatasetPage.deleteFilesAndSave()}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteSelectedFileConfirmation').hide();
-                                    PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-link" onclick="PF('deleteSelectedFileConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="computeInvalid" styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeInvalid" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.compute.computeBatchRestricted']}</p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('computeInvalid').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('computeInvalid').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:outputPanel autoUpdate="true">
@@ -814,18 +831,17 @@
                             </div>
                             <div class="form-group">
                                 <label for="reasonForDeaccession">
-                                #{bundle['file.deaccessionDialog.enterInfo']}
+                                    #{bundle['file.deaccessionDialog.enterInfo']}
                                 </label>
                                 <p:inputTextarea id="reasonForDeaccession" styleClass="form-control"  autoResize="false" rows="2" cols="40"                                           
-                                                 value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}"                                              
-                                                 > 
+                                                 value="#{DatasetPage.deaccessionReasonText}" widgetVar="reasonForDeaccession" validator="#{DatasetPage.validateDeaccessionReason}"> 
                                     <f:attribute name="reasonRadio" value="#{reasonRadio}" />
                                 </p:inputTextarea>
                                 <p:message for="reasonForDeaccession"/>
                             </div>
                             <div class="form-group">
                                 <label for="forwardURLForDeaccession">
-                                #{bundle['file.deaccessionDialog.leaveURL']}
+                                    #{bundle['file.deaccessionDialog.leaveURL']}
                                 </label>
                                 <p:inputText id="forwardURLForDeaccession" styleClass="form-control" value="#{DatasetPage.deaccessionForwardURLFor}" widgetVar="forwardURLForDeaccession"
                                              validator="#{DatasetPage.validateForwardURL}"/>
@@ -833,11 +849,11 @@
                                 <p:watermark for="forwardURLForDeaccession" value="#{bundle['file.deaccessionDialog.leaveURL.watermark']}" id="watermark" />
                             </div>
                             <div class="button-block">
-                                <p:commandLink styleClass="btn btn-default" value="#{bundle.deaccession}"  
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.deaccession}"  
                                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('deaccessionConfirmation').show();">
                                     <f:param name="DO_DEACCESSION_VALIDATION" value="true"/>
-                                </p:commandLink>
-                                <p:commandLink type="button" styleClass="btn btn-link" immediate ="true" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();"/>
+                                </p:commandButton>
+                                <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.setRenderDeaccessionPopup(false)}" onclick="PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" immediate="true"/>
                             </div>
                         </p:dialog>
                     </p:outputPanel>
@@ -846,17 +862,20 @@
                         <div class="button-block">
                             <h:commandButton styleClass="btn btn-default" value="#{bundle.yes}" onclick="PF('deaccessionConfirmation').hide();
                                     PF('deaccessionBlock').hide()" action="#{DatasetPage.deaccessionVersions}" />
-                            <button type="button" class="btn btn-link" value="No" onclick="PF('deaccessionConfirmation').hide()">#{bundle.no}</button>
+                            <button class="btn btn-link" onclick="PF('deaccessionConfirmation').hide();" type="button">
+                                #{bundle.no}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="deaccessionAllConfirmation" header="#{bundle['dataset.editBtn.itemLabel.deaccession']}" widgetVar="deaccessionAllConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.deaccessionDataset.tip']}</p>
                         <div class="button-block">
-                            <h:commandButton styleClass="btn btn-default" value="Yes" onclick="PF('deaccessionAllConfirmation').hide();
-                                    PF('deaccessionBlock').hide();
-                                    PF('blockDatasetForm').hide();" action="#{DatasetPage.deaccessionVersions}" />
-                            <button type="button" class="btn btn-link" value="No" onclick="PF('deaccessionAllConfirmation').hide();
-                                    PF('blockDatasetForm').hide();">#{bundle.no}</button>
+                            <h:commandButton styleClass="btn btn-default" value="#{bundle.yes}" 
+                                            onclick="PF('deaccessionAllConfirmation').hide();PF('deaccessionBlock').hide();PF('blockDatasetForm').hide();" 
+                                            action="#{DatasetPage.deaccessionVersions}"/>
+                            <button class="btn btn-link" onclick="PF('deaccessionAllConfirmation').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.no}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:confirmDialog id="selectDeaccessionVersion" message="#{bundle['file.deaccessionDialog.dialog.selectVersion.tip']}" header="#{bundle['file.deaccessionDialog.dialog.selectVersion.header']}" widgetVar="selectDeaccessionVersion"> </p:confirmDialog>
@@ -868,7 +887,9 @@
                     <p:dialog id="compareTwo" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="compareTwo" modal="true">
                         <p class="help-block"><span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('compareTwo').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('compareTwo').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="detailsBlocks" styleClass="largePopUp" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="detailsBlocks" modal="true">
@@ -990,15 +1011,15 @@
                             </p:dataTable>
                         </div>
                         <div class="panel panel-default" jsf:rendered="#{!empty(DatasetPage.datasetVersionDifference.changedTermsAccess)}">
-                            <div class="panel-heading text-info" >
+                            <div class="panel-heading text-info">
                                 <h:outputText id="outputTextTOU" value="#{bundle['dataset.versionDifferences.termsOfUseAccess']}"/>
                             </div>
                             <p:dataTable id="changedTermsAccessTable" styleClass="dvnDifferanceTable" var="diffArray" value="#{DatasetPage.datasetVersionDifference.changedTermsAccess}">
                                 <p:column styleClass="versionValue">
-                                    <h:outputText value="#{diffArray[0]}" />
+                                    <h:outputText value="#{diffArray[0]}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails">
-                                    <h:outputText value="#{diffArray[1]}" />
+                                    <h:outputText value="#{diffArray[1]}"/>
                                 </p:column>
                                 <p:column styleClass="versionDetails" >
                                     <h:outputText value="#{diffArray[2]}"/>
@@ -1006,64 +1027,79 @@
                             </p:dataTable>
                         </div>
                         <div class="button-block margin-bottom">
-                            <p:commandButton value="#{bundle.done}" onclick="PF('detailsBlocks').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('detailsBlocks').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.done}
+                            </button>
                         </div>
                     </p:dialog>
                     
                     <p:dialog id="selectFilesForDownload" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDownload" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDownload" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDownload']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForDownload').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForDownload').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForRequestAccess" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRequestAccess" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRequestAccess" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForRequestAccess']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForRequestAccess').hide();
-                                    PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForRequestAccess').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForDelete" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDelete" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDelete" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDelete']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForDelete').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForDelete').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForRestrict" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRestrict" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRestrict" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForRestrict']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForRestrict').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForRestrict').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForUnRestrict" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForUnRestrict" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForUnRestrict" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForUnRestrict']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForUnRestrict').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForUnRestrict').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForEditMetadata" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditMetadata" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditMetadata" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForMetadataEdit']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForEditMetadata').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForEditMetadata').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
                     <p:dialog id="selectFilesForEditTags" styleClass="smallPopUp"
-                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditTags" modal ="true">
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditTags" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForMetadataEdit']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForEditTags').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('selectFilesForEditTags').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1122,10 +1158,8 @@
                                             <p:inputText id="fileTagAddNewDS" styleClass="form-control"
                                                          type="text" value="#{DatasetPage.newCategoryName}"
                                                          placeholder="#{bundle['file.editTagsDialog.newName']}"
-                                                         onkeypress="if (event.keyCode == 13) {
-                                                                     return false;
-                                                                 }" />
-                                            <p:commandLink styleClass="btn btn-default" style="margin-left:.5em;" value="#{bundle.apply}" action="#{DatasetPage.saveNewCategory}" update="selectedTagsList, fileTagAddNewDS, fileTagsMenuDS"/>
+                                                         onkeypress="if (event.keyCode == 13) {return false;}"/>
+                                            <p:commandButton styleClass="btn btn-default" style="margin-left:.5em;" value="#{bundle.apply}" action="#{DatasetPage.saveNewCategory}" update="selectedTagsList, fileTagAddNewDS, fileTagsMenuDS"/>
                                         </div>
                                     </div>
                                     <p:message for="fileTagAddNewDS" display="text" />
@@ -1161,7 +1195,7 @@
                         </div>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" id="fileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileTagsPopup').hide()" update=":datasetForm:tabView:filesTable, :datasetForm" action="#{DatasetPage.saveFileTagsAndCategories()}"/>
-                            <p:commandLink styleClass="btn btn-link" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
+                            <p:commandButton styleClass="btn btn-link" id="fileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('fileTagsPopup').hide();PF('blockDatasetForm').hide();" actionListener="#{DatasetPage.clearFileMetadataSelectedForTagsPopup()}"/>
                         </div>
                     </p:dialog>
                     <!-- Request Access Sign Up/Log In Button -->
@@ -1175,8 +1209,9 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('accessSignUpLogIn_popup').hide();
-                                    PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <!-- END: Request Access Sign Up/Log In Button -->
@@ -1269,13 +1304,13 @@
                             </div>
                         </div>
                         <div class="button-block">
-                            <p:commandLink id="saveLinkButton" type="button" styleClass="btn btn-default"    
+                            <p:commandButton id="saveLinkButton" styleClass="btn btn-default"    
                                            update="linkNameContent @([id$=Messages])" 
                                            oncomplete="if (args &amp;&amp; !args.validationFailed) linkDatasetCommand();"
                                            value="#{bundle['dataset.link.save']}">  
                                 <f:param name="DO_DS_LINK_VALIDATION" value="true"/>
-                             </p:commandLink>
-                            <button type="button" class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();">                              
+                            </p:commandButton>
+                            <button class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();" type="button">                              
                                 #{bundle.cancel}
                             </button>
                         </div>
@@ -1286,9 +1321,9 @@
                     <p:dialog id="computeBatchListPopup" header="#{bundle['dataset.compute.computeBatchListHeader']}" widgetVar="computeBatchListPopup" modal="true">
                         <div class="text-right">
                             <!-- Clear link -->
-                            <p:commandLink type="button" styleClass="btn btn-default" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">
+                            <p:commandButton styleClass="btn btn-default" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">
                                 <span class="glyphicon glyphicon-remove"/> <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
-                            </p:commandLink>
+                            </p:commandButton>
                         </div>
                         <h:dataTable id="computeBatch" class="table table-striped" value="#{DatasetPage.cartList}" var='computeCartDatasetList'>
                             <h:column>
@@ -1307,7 +1342,9 @@
                             <h:outputLink styleClass="btn btn-default" value="#{DatasetPage.cartComputeUrl}" onclick="PF('computeBatchListPopup').hide()" target="_blank">
                                 <h:outputText value="#{bundle['dataset.compute.computeBatchCompute']}"/>
                             </h:outputLink>
-                            <h:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('computeBatchListPopup').hide();" type="button" />
+                            <button class="btn btn-link" onclick="PF('computeBatchListPopup').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1322,7 +1359,7 @@
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                                     </label>
                                     <div class="col-sm-9">
-                                        <p:inputTextarea id="termsAccessInput" value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
+                                        <p:inputTextarea id="termsAccessInput" value="#{DatasetPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa"/>
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -1338,13 +1375,13 @@
                                 </div>
                             </div>
                             <div class="button-block">
-                                <ui:fragment rendered="#{DatasetPage.editMode != 'CREATE'}">
-                                    <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.restrictSelectedFiles(true)}" />
-                                </ui:fragment>
-                                <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
-                                    <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.save()}" />
-                                </ui:fragment>
-                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button" />
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{DatasetPage.editMode != 'CREATE'}"
+                                                    onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.restrictSelectedFiles(true)}"/>
+                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{DatasetPage.editMode == 'CREATE'}"
+                                                    onclick="PF('accessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.save()}"/>
+                                <button class="btn btn-link" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                    #{bundle.cancel}
+                                </button>
                             </div>
                         </ui:fragment>
                     </p:dialog>
@@ -1354,9 +1391,11 @@
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.submitMessage']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.submit}" onclick="PF('inreview').hide();
-                                    PF('blockDatasetForm').hide();" action="#{DatasetPage.submitDataset}" immediate="true"  />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.submit}" 
+                                             onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.submitDataset}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1369,9 +1408,11 @@
                             <h:outputText value="#{DatasetPage.datasetPublishCustomText}" escape="false"/>
                         </div>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('publishConfirm').hide();
-                                    PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" immediate="true"  />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
+                                             onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1393,9 +1434,11 @@
                             #{bundle['dataset.publishBoth.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.mayNotBePublished.both.button']}" onclick="PF('publishParent').hide();
-                                    PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseParentDVAndDataset}" immediate="true"  />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button" immediate="true"  />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle['dataset.mayNotBePublished.both.button']}" 
+                                             onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseParentDVAndDataset}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1425,10 +1468,15 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}" action="#{DatasetPage.releaseDraft}" />
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('releaseDraft').hide();
-                                    PF('blockDatasetForm').hide();" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}" action="#{DatasetPage.releaseMajor}" immediate="true" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
+                                             rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}"
+                                             onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDraft}"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" 
+                                             rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}"
+                                             onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseMajor}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('releaseDraft').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1444,8 +1492,9 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('mayNotRelease').hide();
-                                    PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('mayNotRelease').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1466,8 +1515,9 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('maynotPublishParent').hide();
-                                    PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('maynotPublishParent').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -1477,26 +1527,27 @@
                         </p>
                         <ui:remove>
                         <!--FIXME update for new comments table -->
-                        <p:inputTextarea id="returnReason" rows="3"  value="#{DatasetPage.workingVersion.returnReason}" maxlength="200" widgetVar="returnReason"
-                                         cols="70" counter="display"  counterTemplate="{0} characters remaining." autoResize="false"/>
+                        <p:inputTextarea id="returnReason" rows="3" value="#{DatasetPage.workingVersion.returnReason}" maxlength="200" widgetVar="returnReason"
+                                         cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"/>
                         <p>
-                        <h:outputText id="display" />
+                            <h:outputText id="display"/>
                         </p>
-                        <p:watermark for="returnReason" value="#{bundle['dataset.rejectWatermark']}" id="returnReasonwatermark" />
+                        <p:watermark for="returnReason" value="#{bundle['dataset.rejectWatermark']}" id="returnReasonwatermark"/>
                         </ui:remove>
 
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}"/>
                             <ui:remove>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="testReturnReason();"  />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="testReturnReason();"/>
                             </ui:remove>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button" />
+                            <button class="btn btn-link" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
-                    <p:remoteCommand name="returnToAuthorCommand"   action="#{DatasetPage.sendBackToContributor}"/>
-                    <p:confirmDialog id="enterReturnReason" message="#{bundle['dataset.reject.enterReason']}" header="#{bundle['dataset.reject.enterReason.header']}" widgetVar="enterReturnReason"> </p:confirmDialog>                   
-                    
-                     <!-- END: Publish/Submit for Review Dialogs -->
+                    <p:remoteCommand name="returnToAuthorCommand" action="#{DatasetPage.sendBackToContributor}"/>
+                    <p:confirmDialog id="enterReturnReason" message="#{bundle['dataset.reject.enterReason']}" header="#{bundle['dataset.reject.enterReason.header']}" widgetVar="enterReturnReason"></p:confirmDialog>                   
+                    <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
                 <script type="text/javascript">
                     $(document).ready(function () {
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index fed7d31a398..140f63004a9 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -367,9 +367,9 @@
                                     </ui:fragment>
                                     <!-- END: Publish Button -->
                                     <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
-                                        <a href="#" type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                        <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                             <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
-                                        </a>
+                                        </button>
                                         <ul class="dropdown-menu pull-right text-left" role="menu">
                                             <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
                                                 <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
@@ -490,7 +490,7 @@
                                 <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
 
                                 <div class="button-block">
-                                    <button type="button" onclick="PF('shareDialog').hide()" class="btn btn-default" value="#{bundle.close}">
+                                    <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                         #{bundle.close}
                                     </button>
                                 </div>
@@ -568,11 +568,11 @@
 
                     <!-- Save / Cancel Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty DataversePage.editMode}">
-                        <p:commandButton id="save" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
+                        <p:commandButton id="save" styleClass="btn btn-default" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
                             <f:ajax onerror="window.scrollTo(0, 0)" />
                         </p:commandButton>
-                        <p:commandButton id="cancel" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();" />
-                        <p:button tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
+                        <p:commandButton id="cancel" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();"/>
+                        <p:button id="cancelCreate" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
                     </div>
 
                     <!-- POPUPS -->
@@ -589,7 +589,9 @@
                             </div>
                             <div class="button-block">
                                 <p:commandButton styleClass="btn btn-default" value="#{bundle.saveChanges}" action="#{DataversePage.save}"/>
-                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
+                                <button class="btn btn-link" onclick="PF('browseOptsForm').hide();" type="button">                              
+                                    #{bundle.cancel}
+                                </button>
                             </div>
                         </ui:fragment>
                         <ui:fragment rendered="#{empty DataversePage.featuredDataverses.source and empty DataversePage.featuredDataverses.target}">
@@ -597,7 +599,9 @@
                                 <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.nopublished.tip']}
                             </p>
                             <div class="button-block">
-                                <p:commandButton value="#{bundle.cancel}" onclick="PF('browseOptsForm').hide()"/>
+                                <button class="btn btn-link" onclick="PF('browseOptsForm').hide();" type="button">                              
+                                    #{bundle.cancel}
+                                </button>
                             </div>
                         </ui:fragment>
                     </p:dialog>
@@ -608,8 +612,10 @@
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.publish.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('confirmation').hide()" action="#{DataversePage.releaseDataverse}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('confirmation').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('confirmation').hide()" action="#{DataversePage.releaseDataverse}"/>
+                            <button class="btn btn-link" onclick="PF('confirmation').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -618,7 +624,9 @@
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.publish.failed.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-link" value="#{bundle.close}" onclick="PF('mayNotRelease').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('mayNotRelease').hide();" type="button">                              
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -627,8 +635,10 @@
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.delete.tip']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DataversePage.deleteDataverse}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide();" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{DataversePage.deleteDataverse}"/>
+                            <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
@@ -705,7 +715,9 @@
                                               rendered="#{DataversePage.linkMode == 'LINKDATAVERSE'}"/>
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.savedsearch.save']}" action="#{DataversePage.saveSavedSearch}"
                                              rendered="#{DataversePage.linkMode == 'SAVEDSEARCH'}"/>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
+                            <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </h:form>
                     <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 1}">
@@ -724,7 +736,9 @@
                         </div>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['dataverse.link.save']}" onclick="PF('linkDataverseForm').hide()" actionListener="#{DataversePage.saveLinkedDataverse()}"/>
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('linkDataverseForm').hide()"/>
+                            <button class="btn btn-link" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </ui:fragment>
                     <ui:fragment rendered="#{DataversePage.dataversesForLinking.size() == 0}">
@@ -732,7 +746,9 @@
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.link.no.linkable']}
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('linkDataverseForm').hide()"/>
+                            <button class="btn btn-default" onclick="PF('linkDataverseForm').hide();" type="button">                              
+                                #{bundle.close}
+                            </button>
                         </div>
                     </ui:fragment>
                 </p:dialog>
@@ -743,8 +759,10 @@
                         <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.resetModifications.text']}
                     </p>
                     <div class="button-block">
-                        <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="check();PF('resetModifications').hide()" />
-                        <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="uncheck();PF('resetModifications').hide()" />
+                        <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="check();PF('resetModifications').hide()"/>
+                        <button class="btn btn-link" onclick="uncheck();PF('resetModifications').hide()" type="button">                              
+                            #{bundle.cancel}
+                        </button>
                     </div>
                 </p:dialog>
 
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 23aa98ab3fa..f4eca112998 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -193,8 +193,7 @@
         <o:form class="form-inline">
             <div id="status-alert" class="bg-warning" jsf:rendered="#{!empty settingsWrapper.get(':StatusMessageText') and !empty settingsWrapper.get(':StatusMessageHeader') and !dataverseSession.isStatusDismissed()}">
                 <div class="alert alert-dismissible container text-warning">
-                    <p:commandButton class="close" id="closeButton" actionListener="#{dataverseSession.setStatusDismissed(true)}" update="@form" value="&#215;" />
-<!--                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&#215;</span></button>-->
+                    <p:commandButton class="close" id="closeButton" actionListener="#{dataverseSession.setStatusDismissed(true)}" update="@form" value="&#215;"/>
                     <h:outputText styleClass="highlightBold" value="#{!empty settingsWrapper.get(':StatusMessageHeader') ? settingsWrapper.get(':StatusMessageHeader') : bundle['header.status.header']}"/>
                     <h:outputText rendered="#{!empty settingsWrapper.get(':StatusMessageText')}" value=" – #{settingsWrapper.get(':StatusMessageText')}" escape="false"/>
                 </div>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 3c407a473bc..a4da5fdc950 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -481,7 +481,8 @@
                             </script>
                             <div>
                                 <button class="btn btn-default" jsf:action="#{ApiTokenPage.generate()}">
-                                    #{ApiTokenPage.checkForApiToken() ? bundle['apitoken.regenerateBtn'] : bundle['apitoken.generateBtn']}                                </button>
+                                    #{ApiTokenPage.checkForApiToken() ? bundle['apitoken.regenerateBtn'] : bundle['apitoken.generateBtn']}
+                                </button>
                             </div>
                         </p:tab>
                         <ui:remove>
@@ -649,10 +650,10 @@
                                     <div class="col-sm-12 button-block">
                                         <p:commandButton id="save" styleClass="btn btn-default"
                                                          value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn']:bundle.saveChanges}"
-                                                         action="#{DataverseUserPage.save}" update="@form,:messagePanel,:userDisplayInfoTitle" />
-                                        <p:commandButton id="cancel" styleClass="btn btn-default" value="#{bundle.cancel}"
+                                                         action="#{DataverseUserPage.save}" update="@form,:messagePanel,:userDisplayInfoTitle"/>
+                                        <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}"
                                                          action="#{DataverseUserPage.cancel}" process="@this" update="@form">
-                                            <p:resetInput target="@form" />
+                                            <p:resetInput target="@form"/>
                                         </p:commandButton>
                                     </div>
                                 </div>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 4fdda8bd86c..2c76ba885f5 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -521,14 +521,18 @@
             <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('fileTypeDifferentPopup').hide()" 
                              action="#{EditDatafilesPage.deleteFiles()}"
                              update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage"/>
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('fileTypeDifferentPopup').hide()" type="button" />
+            <button class="btn btn-default" onclick="PF('fileTypeDifferentPopup').hide();" type="button">                              
+                #{bundle.continue}
+            </button>
         </div>
     </p:dialog>
     <p:dialog id="selectFilesForDeleteFragment" styleClass="smallPopUp"
-              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDeleteFragment" modal ="true">
+              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForDeleteFragment" modal="true">
         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForDelete']}</p>
         <div class="button-block">
-            <p:commandButton styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('selectFilesForDeleteFragment').hide();"/>
+            <button class="btn btn-default" onclick="PF('selectFilesForDeleteFragment').hide();" type="button">                              
+                #{bundle.close}
+            </button>
         </div>
     </p:dialog>
     <p:dialog id="deleteFileConfirmDialog" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
@@ -538,8 +542,10 @@
         </ui:fragment>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();"
-                             update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}" />
-            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
+                             update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}"/>
+            <button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide();" type="button">                              
+                #{bundle.cancel}
+            </button>
         </div>
     </p:dialog>
     <p:dialog id="editFileAccessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="editFileAccessPopup" modal="true">
@@ -550,16 +556,10 @@
                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                 </label>
-                <ui:fragment rendered="#{!datasetPage}">
-                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
-                    <p:inputTextarea value="#{version.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" />
+                <div class="col-sm-9">
+                    <p:inputTextarea styleClass="form-control" rendered="#{!empty version.termsOfUseAndAccess}"
+                                     value="#{version.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5"/>
                 </div>
-                </ui:fragment> 
-                <ui:fragment rendered="#{datasetPage}">
-                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
-                    <p:inputTextarea value="#{DatasetPage.enteredTermsOfAccess}" autoResize="false" rows="5" styleClass="form-control" />
-                </div>
-                </ui:fragment> 
             </div>
             <div class="form-group">
                 <label for="metadata_RequestAccess" class="col-sm-3 control-label">
@@ -567,22 +567,17 @@
                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                 </label>
-                <ui:fragment rendered="#{!datasetPage}">
-                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
-                    <p:selectBooleanCheckbox id="editFileRequestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{version.termsOfUseAndAccess.fileAccessRequest}"/>
-                </div>
-                </ui:fragment> 
-                <ui:fragment rendered="#{datasetPage}">
-                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
-                    <p:selectBooleanCheckbox id="editFileRequestAccessDSP" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{DatasetPage.enteredFileAccessRequest}"/>
+                <div class="col-sm-9">
+                    <p:selectBooleanCheckbox id="editFileRequestAccess" rendered="#{!empty version.termsOfUseAndAccess}"
+                                             itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{version.termsOfUseAndAccess.fileAccessRequest}"/>
                 </div>
-                </ui:fragment>
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton rendered="#{!datasetPage}" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{EditDatafilesPage.saveWithTermsOfUse()}" />
-            <p:commandButton rendered="#{datasetPage}" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.saveWithTermsOfUse()}" />
-            <p:commandButton value="#{bundle.cancel}" onclick="PF('editFileAccessPopup').hide();PF('blockFileForm').hide();" type="button" />
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{EditDatafilesPage.saveWithTermsOfUse()}"/>
+            <button class="btn btn-link" onclick="PF('editFileAccessPopup').hide();PF('blockFileForm').hide();" type="button">                              
+                #{bundle.cancel}
+            </button>
         </div>
     </p:dialog>
     <p:dialog id="fileAdvancedOptions" styleClass="dialog-submenu smallPopUp" header="#{bundle['file.advancedIngestOptions']}" widgetVar="fileAdvancedOptions" modal="true">
@@ -764,7 +759,7 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="fileAdvancedOptionsSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('fileAdvancedOptions').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAdvancedOptions()}"/>
-            <p:commandLink styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileAdvancedOptionsCancelButton" value="#{bundle.cancel}" onclick="PF('fileAdvancedOptions').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForIngestOptionsPopup()}"/>
         </div>
     </p:dialog>
     <!-- end of "advanced options" dialogue -->
@@ -785,7 +780,7 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="fileSetThumbnailSaveBtn" value="#{bundle.saveChanges}" oncomplete="PF('fileSetThumbnail').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.saveAsDesignatedThumbnail()}"/>
-            <p:commandLink styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
+            <p:commandButton styleClass="btn btn-link" id="fileSetThumbnailCancelBtn" value="#{bundle.cancel}" onclick="PF('fileSetThumbnail').hide();PF('blockFileForm').hide();" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForThumbnailPopup()}"/>
         </div>
     </p:dialog>
     <p:dialog id="fileThumbnailConfirm" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileThumbnailConfirm" modal="true">
@@ -796,7 +791,9 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="fileThumbnailConfirmCntBtn" value="#{bundle.continue}" oncomplete="PF('fileThumbnailConfirm').hide()" update=":datasetForm:filesTable,:messagePanel" actionListener="#{EditDatafilesPage.deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead()}"/>
-            <p:commandLink styleClass="btn btn-link" id="fileThumbnailConfirmCancelBtn" value="#{bundle.cancel}" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();"/>
+            <button class="btn btn-link" onclick="PF('fileThumbnailConfirm').hide();PF('blockFileForm').hide();" type="button">                              
+                #{bundle.cancel}
+            </button>
         </div>
     </p:dialog>
     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml"/>
@@ -846,11 +843,9 @@
                             <p:inputText id="fileTagAddNew" styleClass="form-control"
                                          type="text" value="#{EditDatafilesPage.newCategoryName}"
                                          placeholder="#{bundle['file.editTagsDialog.newName']}"
-                                         onkeypress="if (event.keyCode == 13) {
-                                                     return false;
-                                                 }" />
-                            <p:commandLink styleClass="btn btn-default" style="margin-left:.5em;" value="#{bundle.apply}" action="#{EditDatafilesPage.saveNewCategory}" update="selectedTagsListEFF, fileTagAddNew, fileTagsMenu"/>
-                            <p:message for="fileTagAddNew" display="text" />
+                                         onkeypress="if (event.keyCode == 13) {return false;}"/>
+                            <p:commandButton styleClass="btn btn-default" style="margin-left:.5em;" value="#{bundle.apply}" action="#{EditDatafilesPage.saveNewCategory}" update="selectedTagsListEFF, fileTagAddNew, fileTagsMenu"/>
+                            <p:message for="fileTagAddNew" display="text"/>
                         </div>
                     </div>
                 </div>
@@ -883,7 +878,7 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="editFileTagsPopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('editFileTagsPopup').hide()" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.saveFileTagsAndCategories()}"/>
-            <p:commandLink styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
+            <p:commandButton styleClass="btn btn-link" id="editFileTagsPopupCancelButton" value="#{bundle.cancel}" onclick="PF('editFileTagsPopup').hide();PF('blockFileForm').hide();" update=":datasetForm:filesTable" actionListener="#{EditDatafilesPage.clearFileMetadataSelectedForTagsPopup()}"/>
         </div>
     </p:dialog>
     <script type="text/javascript" src="/resources/js/dropins.js" id="dropboxjs" data-app-key="#{EditDatafilesPage.dropBoxKey}"/>
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 071ad9d04c6..9b53450ab4a 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -66,51 +66,44 @@
                     </ui:fragment>  
                     
                     <!-- Create/Save Dataset Button Panel -->
-                    <ui:fragment  id="editDataFilesButtons">
-                        <div  class="button-block">
-                            <p:outputPanel id="filesButtons" >
+                    <ui:fragment id="editDataFilesButtons">
+                        <div class="button-block">
+                            <p:outputPanel id="filesButtons">
                                 <div jsf:rendered="#{!(empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment()))}">
-                                    <p:commandButton tabindex="1000" id="savebutton" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();"   >
-                                    </p:commandButton> 
-                                    <p:commandButton tabindex="1000" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();"/>
+                                    <p:commandButton styleClass="btn btn-default" tabindex="1000" id="savebutton" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();"/> 
+                                    <p:commandButton styleClass="btn btn-link" tabindex="1000" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();"/>
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
-                                    <p:commandButton tabindex="1000" id="doneFilesButtonnop" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
-                                    </p:commandButton>
-
+                                    <p:commandButton styleClass="btn btn-default" tabindex="1000" id="doneFilesButtonnop" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();"/>
                                 </div>
                                 <p:commandButton value="Direct" id="datasetSave"
                                                  style="display:none"
                                                  update=":datasetForm,:messagePanel"
                                                  onclick="PF('blockFileForm').show();"
                                                  oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
-                                                 action="#{EditDatafilesPage.save}" />
-                            </p:outputPanel> 
+                                                 action="#{EditDatafilesPage.save}"/>
+                            </p:outputPanel>
                         </div>
                     </ui:fragment>
-
                     <!-- END: Create/Save Dataset Button Panel -->
-
                 </h:form>
                 
                 <p:blockUI block="datasetForm" widgetVar="blockFileForm"/>
 
                 <script type="text/javascript">
-                    
                     function clickSave(){
                         $('button[id$="datasetSave"]').trigger('click');
                     }
 
-    function checkNewlyRestricted() {
-        if ($('input[id$="showAccessPopup"]').val() === 'true') {
-            PF('editFileAccessPopup').show();
-        }
-        else {
-            $('button[id$="datasetSave"]').trigger('click');
-        }
-    }
+                    function checkNewlyRestricted() {
+                        if ($('input[id$="showAccessPopup"]').val() === 'true') {
+                            PF('editFileAccessPopup').show();
+                        }
+                        else {
+                            $('button[id$="datasetSave"]').trigger('click');
+                        }
+                    }
                 </script>
-
             </ui:define>
         </ui:composition>
     </h:body>
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 9fa4ea992b5..1a55d96c1a5 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -84,14 +84,16 @@
                 </div>
             </div>
             <div class="button-block">
-                <p:commandLink type="button" styleClass="btn btn-default" 
+                <p:commandButton styleClass="btn btn-default" 
                                value="#{bundle['dataverse.permissions.explicitGroupEditDialog.createGroup']}"
                                update="explicitGroupNewDialogContent allGroups :messagePanel"
                                actionListener="#{manageGroupsPage.createExplicitGroup}"
                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('explicitGroupForm').hide();">
                     <f:param name="DO_GROUP_VALIDATION" value="true"/>
-                </p:commandLink>
-                <button type="button" class="btn btn-link" onclick="PF('explicitGroupForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                </p:commandButton>
+                <button class="btn btn-link" onclick="PF('explicitGroupForm').hide()" type="button">
+                    #{bundle.cancel}
+                </button>
             </div>
         </p:fragment>
     </p:dialog>
diff --git a/src/main/webapp/file-configure-popup-fragment.xhtml b/src/main/webapp/file-configure-popup-fragment.xhtml
index d369b5ff417..8a065637f1f 100644
--- a/src/main/webapp/file-configure-popup-fragment.xhtml
+++ b/src/main/webapp/file-configure-popup-fragment.xhtml
@@ -13,12 +13,13 @@
         </p>
         
         <div class="button-block">
-            <p:commandLink type="button" styleClass="btn btn-default"
+            <p:commandButton styleClass="btn btn-default" value="#{bundle['continue']}"
                 action="#{configureFragmentBean.configureExternalAlert()}" 
-                value="#{bundle['continue']}" 
                 onclick="PF('configureToolPopup').hide();"
                 update=":messagePanel">
-            </p:commandLink>
-            <button type="button" class="btn btn-link" onclick="PF('configureToolPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            </p:commandButton>
+            <button class="btn btn-link" onclick="PF('configureToolPopup').hide();PF('blockDatasetForm').hide();" type="button">
+                #{bundle.cancel}
+            </button>
         </div>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 5375764515f..0b22d5fbcc8 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -105,17 +105,17 @@
     </div>
     
     <!-- Compute Button *File pg only*: -->
-    <h:outputLink value="#{FilePage.computeUrl}" type="button" class="btn btn-default btn-compute" target="_blank" rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
+    <h:outputLink value="#{FilePage.computeUrl}" class="btn btn-default btn-compute" target="_blank" rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
         <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
     </h:outputLink>
     <!-- Compute Button *Dataset pg only*: -->
-    <h:outputLink value="#{DatasetPage.getComputeUrl(fileMetadata)}" type="button" class="btn btn-default btn-compute" target="_blank" rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
+    <h:outputLink value="#{DatasetPage.getComputeUrl(fileMetadata)}" class="btn btn-default btn-compute" target="_blank" rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
         <span class="glyphicon glyphicon-flash"/> #{bundle['file.compute']}
     </h:outputLink>
     
     <p:commandLink rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                               and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                   type="button" styleClass="btn btn-default btn-download" process="@this"
+                   styleClass="btn btn-default btn-download" process="@this"
                    disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
                    update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
         <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" />
@@ -127,7 +127,7 @@
 
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
                               and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                    type="button" styleClass="btn btn-default btn-download"
+                   styleClass="btn btn-default btn-download"
                    process="@this"
                    disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
                    action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
@@ -140,7 +140,7 @@
 
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
                                 and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   type="button" styleClass="btn btn-default btn-download"
+                   styleClass="btn btn-default btn-download"
                    process="@this"
                    disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
                    actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
@@ -151,7 +151,7 @@
 
     <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
                                 and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   type="button" styleClass="btn btn-default btn-download"
+                   styleClass="btn btn-default btn-download"
                    process="@this"
                    disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
                    action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
@@ -292,7 +292,7 @@
             </li>
         </ul>
     </div>        
-    <p:commandLink type="button" styleClass="btn btn-default btn-request" rendered="#{(fileDownloadHelper.session.user.authenticated 
+    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{(fileDownloadHelper.session.user.authenticated 
                                                                           and !fileMetadata.datasetVersion.deaccessioned
                                                                           and fileMetadata.dataFile.owner.fileAccessRequest 
                                                                           and !(fileDownloadHelper.canDownloadFile(fileMetadata)))
@@ -302,26 +302,24 @@
                    update="@this"
                    disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
         <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-    </p:commandLink>                        
-    
-    <p:commandLink type="button" styleClass="btn btn-default btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
+    </p:commandLink>
+    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
                                                                           and !fileMetadata.datasetVersion.deaccessioned
                                                                           and fileMetadata.dataFile.owner.fileAccessRequest 
                                                                           and !(fileDownloadHelper.canDownloadFile(fileMetadata))
-                                                                            and requestAccessPopupRequired}"
+                                                                          and requestAccessPopupRequired}"
                    process="@this"
                    actionListener="#{fileDownloadHelper.addFileForRequestAccess(fileMetadata.dataFile)}"
                    onclick="PF('requestAccessPopup').show()"
                    id="requestAccessPopupButton"
                    disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
         <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
-    </p:commandLink>       
-    <p:commandLink type="button" 
-                   styleClass="btn btn-default btn-request"
-                   process="@this"
-                   rendered="#{!fileDownloadHelper.session.user.authenticated 
+    </p:commandLink>
+    <p:commandLink styleClass="btn btn-default btn-request" rendered="#{!fileDownloadHelper.session.user.authenticated 
                                                                           and !fileMetadata.datasetVersion.deaccessioned
-                                                                          and fileMetadata.dataFile.owner.fileAccessRequest and !(fileDownloadHelper.canDownloadFile(fileMetadata))}"
+                                                                          and fileMetadata.dataFile.owner.fileAccessRequest 
+                                                                          and !(fileDownloadHelper.canDownloadFile(fileMetadata))}"
+                   process="@this"
                    onclick="PF('accessSignUpLogIn_popup').show()">
         <!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
         <span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml
index 43652e44054..249d9df5450 100644
--- a/src/main/webapp/file-download-popup-fragment.xhtml
+++ b/src/main/webapp/file-download-popup-fragment.xhtml
@@ -148,41 +148,37 @@
         </div>
         <div class="button-block">
             <!--Note: the guestbookResponse.fileFormat is being set in xhtml via the initial download buttons in file-download-button-fragment.xhtml -->
-            <p:commandLink type="button" process="@this" styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat != 'externalTool'
+            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat != 'externalTool'
                                                                                                                             and guestbookResponse.fileFormat != 'subset'
                                                                                                                             and guestbookResponse.fileFormat != 'worldMap'
                                                                                                                             and guestbookResponse.fileFormat != 'package'}"
                            actionListener="#{fileDownloadHelper.writeGuestbookAndStartDownload(guestbookResponse)}"
-                           update="guestbookUIFragment"
-                           >
+                           update="guestbookUIFragment">
                 <f:param name="DO_GB_VALIDATION" value="true"/>
-            </p:commandLink>
-            <p:commandLink type="button" process="@this" styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'subset'}"
+            </p:commandButton>
+            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'subset'}"
                            actionListener="#{fileDownloadHelper.writeGuestbookAndOpenSubset(guestbookResponse)}"
-                           update="guestbookUIFragment @form" >                                    
+                           update="guestbookUIFragment @form">                                    
                 <f:param name="DO_GB_VALIDATION" value="true"/>               
-            </p:commandLink>
-            <p:commandLink type="button" styleClass="btn btn-default" rendered="#{guestbookResponse.fileFormat == 'worldMap'}"
-                           actionListener="#{fileDownloadHelper.startWorldMapDownloadLink(guestbookResponse, null)}" 
-                            update="guestbookUIFragment" >
-                #{bundle['acceptTerms']} 
-           <f:param name="DO_GB_VALIDATION" value="true"/> 
-            </p:commandLink>
+            </p:commandButton>
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'worldMap'}"
+                            actionListener="#{fileDownloadHelper.startWorldMapDownloadLink(guestbookResponse, null)}" 
+                            update="guestbookUIFragment">
+                <f:param name="DO_GB_VALIDATION" value="true"/> 
+            </p:commandButton>
             <!--On the dataset page (but not the file page), "tool" is null so we get the tool from the guestbookResponse.-->
-            <p:commandLink type="button" process="@this" styleClass="btn btn-default" rendered="#{guestbookResponse.fileFormat == 'externalTool'}"
+            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'externalTool'}"
                            action="#{fileDownloadHelper.writeGuestbookAndLaunchExploreTool(guestbookResponse, fileMetadata, tool)}"
                            update="guestbookUIFragment">
-                #{bundle['acceptTerms']}
                 <f:param name="DO_GB_VALIDATION" value="true"/>
-            </p:commandLink>    
-            
-            <p:commandLink type="button" process="@this" styleClass="btn btn-default" rendered="#{guestbookResponse.fileFormat == 'package'}"
-                           update="guestbookUIFragment @form @widgetVar(downloadPackagePopup)" >
-                <f:actionListener binding="#{fileDownloadHelper.writeGuestbookAndLaunchPackagePopup(guestbookResponse)}" /> 
-                <f:param name="DO_GB_VALIDATION" value="true"/>  
-                #{bundle['acceptTerms']}
-            </p:commandLink>
-            
-            <button type="button" class="btn btn-link" onclick="PF('downloadPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            </p:commandButton>
+            <p:commandButton styleClass="btn btn-default" process="@this" value="#{bundle.acceptTerms}" rendered="#{guestbookResponse.fileFormat == 'package'}"
+                           update="guestbookUIFragment @form @widgetVar(downloadPackagePopup)">
+                <f:actionListener binding="#{fileDownloadHelper.writeGuestbookAndLaunchPackagePopup(guestbookResponse)}"/>
+                <f:param name="DO_GB_VALIDATION" value="true"/>
+            </p:commandButton>
+            <button class="btn btn-link" onclick="PF('downloadPopup').hide();PF('blockDatasetForm').hide();" type="button">
+                #{bundle.cancel}
+            </button>
         </div>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml
index ef405e01999..f9e3154978d 100644
--- a/src/main/webapp/file-request-access-popup-fragment.xhtml
+++ b/src/main/webapp/file-request-access-popup-fragment.xhtml
@@ -41,11 +41,12 @@
             </div>
         </div>
         <div class="button-block">
-            <p:commandLink type="button" styleClass="btn btn-default"  
+            <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" 
                            action="#{fileDownloadHelper.requestAccessIndirect()}"    
                            update="@([id$=requestAccessPopupButton])" oncomplete="PF('requestAccessPopup').hide();">
-                #{bundle['acceptTerms']}
-            </p:commandLink>
-            <button type="button" class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            </p:commandButton>
+            <button class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" type="button">
+                #{bundle.cancel}
+            </button>
         </div>
 </ui:composition>
diff --git a/src/main/webapp/file-versions.xhtml b/src/main/webapp/file-versions.xhtml
index ce46cb4c434..43a84d5dd2b 100644
--- a/src/main/webapp/file-versions.xhtml
+++ b/src/main/webapp/file-versions.xhtml
@@ -33,11 +33,11 @@
         Details are for a later version
         -->
         <div class="text-right margin-bottom">
-            <p:commandLink type="button" styleClass="btn btn-default" onclick="testCheckBoxes();"
+            <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
                            rendered="#{FilePage.compareVersionsCount > 2}">
                 <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
             </p:commandLink>
-            <p:commandButton  value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
+            <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
                              style="display:none"
                              update=":datasetForm"
                              oncomplete="PF('detailsBlocks').show();post_differences();"
@@ -45,7 +45,7 @@
             </p:commandButton>
         </div>
     </ui:remove>
-    <p:dataTable id="versionsTable" styleClass="" value="#{FilePage.fileMetadatasForTab}" var="versionTab" widgetVar="versionsTable"  
+    <p:dataTable id="versionsTable" value="#{FilePage.fileMetadatasForTab}" var="versionTab" widgetVar="versionsTable"  
                  rowKey="#{versionTab}">
         <ui:remove>
             <!-- start: checkbox column -->
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index d4ed80cc957..40eb7683b60 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -63,10 +63,10 @@
                                 <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                     <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
 
-                                        <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
+                                    <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
 
                                     <div class="button-block">
-                                        <button type="button" onclick="PF('shareDialog').hide()" class="btn btn-default" value="#{bundle.close}">
+                                        <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                             #{bundle.close}
                                         </button>
                                     </div>
@@ -103,8 +103,7 @@
                                     <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
                                                              and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
                                                              and !FilePage.lockedFromEdits
-                                                             and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}"
-                                          >
+                                                             and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
                                         <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
                                         </button>
@@ -395,15 +394,14 @@
                                     <div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView and (dataverseSession.user.authenticated
                                                          and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
                                                          and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)))}">
-                                        <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()"
-                                                       disabled="#{FilePage.lockedFromEdits}">
+                                        <button class="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()" type="button" disabled="#{FilePage.lockedFromEdits}">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
-                                        </p:commandLink>
+                                        </button>
                                     </div>
 
                                     <!-- Export Button -->
                                     <div class="btn-group" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released}">
-                                        <button class="btn btn-default btn-export dropdown-toggle" type="button" styleClass="btn btn-default" data-toggle="dropdown">
+                                        <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
                                         <ul class="dropdown-menu" role="menu">
                                             <ui:repeat var="exporter" value="#{FilePage.getExporters()}">
@@ -551,8 +549,10 @@
                         </ui:fragment>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').hide()" 
-                                             action="#{FilePage.deleteFile()}" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
+                                             action="#{FilePage.deleteFile()}"/>
+                            <button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide()" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
@@ -607,53 +607,58 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('accessSignUpLogIn_popup').hide();PF('blockDatasetForm').hide();"/>
+                            <button class="btn btn-default" onclick="PF('accessSignUpLogIn_popup').hide();PF('blockDatasetForm').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="accessPopup" styleClass="smallPopUp" header="#{bundle['file.restrictions']}" widgetVar="accessPopup" modal="true">
-                        <ui:fragment rendered="true">
-                            <p class="help-block">
-                                #{bundle['file.restrictions.description']}
-                            </p>
-                            <ui:fragment rendered="#{FilePage.worldMapPermissionHelper.hasMapLayerMetadata(FilePage.fileMetadata)}">
-                            <p class="help-block">
-                                <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> #{bundle['file.restrictions.worldmap.warning']}</span>
-                            </p>
-                            </ui:fragment>
-                            <div class="form-horizontal">
-                                <div class="form-group">
-                                    <label for="metadata_TermsAccess" class="col-sm-3 control-label">
-                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p:inputTextarea value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="metadata_RequestAccess" class="col-sm-3 control-label">
-                                        #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
-                                    </label>
-                                    <div class="col-sm-9">
-                                        <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
-                                                                 value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.fileAccessRequest}" widgetVar="inputfar"/>
-                                    </div>
+                        <p:focus context="accessPopup"/>
+                        <p class="help-block">
+                            #{bundle['file.restrictions.description']}
+                        </p>
+                        <ui:fragment rendered="#{FilePage.worldMapPermissionHelper.hasMapLayerMetadata(FilePage.fileMetadata)}">
+                        <p class="help-block">
+                            <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> #{bundle['file.restrictions.worldmap.warning']}</span>
+                        </p>
+                        </ui:fragment>
+                        <div class="form-horizontal">
+                            <div class="form-group">
+                                <label for="metadata_TermsAccess" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" widgetVar="inputtoa"/>
                                 </div>
                             </div>
-                            <div class="button-block">
-                                <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide();" update=":messagePanel" action="#{FilePage.restrictFile(true)}" />
-                                <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('accessPopup').hide();" type="button" />
+                            <div class="form-group">
+                                <label for="metadata_RequestAccess" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                         data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
+                                                             value="#{FilePage.fileMetadata.datasetVersion.termsOfUseAndAccess.fileAccessRequest}" widgetVar="inputfar"/>
+                                </div>
                             </div>
-                        </ui:fragment>
+                        </div>
+                        <div class="button-block">
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('accessPopup').hide();" update=":messagePanel" action="#{FilePage.restrictFile(true)}"/>
+                            <button class="btn btn-link" onclick="PF('accessPopup').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
+                        </div>
                     </p:dialog>
                     <p:dialog id="fileAlreadyReplacedDraft" styleClass="smallPopUp"
                               header="#{bundle['file.replaced.warning.header']}" widgetVar="fileAlreadyReplacedDraft" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.replaced.warning.draft.warningMessage']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('fileAlreadyReplacedDraft').hide();"/>
+                            <button class="btn btn-default" onclick="PF('fileAlreadyReplacedDraft').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="fileAlreadyReplacedPrevious" styleClass="smallPopUp"
@@ -665,13 +670,17 @@
                             <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.alreadyDeleted.previous.warningMessage']}</p>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('fileAlreadyReplacedPrevious').hide();"/>
+                            <button class="btn btn-default" onclick="PF('fileAlreadyReplacedPrevious').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="computeAccessDenied" styleClass="smallPopUp" header="#{bundle['dataset.compute.computeBtn']}" widgetVar="computeAccessDeniedPopup" modal="true">
                         <p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.compute.fileAccessDenied']}</p>
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.close}" onclick="PF('computeAccessDeniedPopup').hide();" type="button" />
+                            <button class="btn btn-default" onclick="PF('computeAccessDeniedPopup').hide();" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 2a2f26ab939..15390c4c6d5 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -141,7 +141,7 @@
                         
                         <!-- UPLOAD FILES BUTTON -->
                         <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD"
-                                      type="button" styleClass="btn btn-default btn-access #{DatasetPage.lockedFromEdits ? 'ui-state-disabled' : ''}"
+                                      styleClass="btn btn-default btn-access #{DatasetPage.lockedFromEdits ? 'ui-state-disabled' : ''}"
                                       disabled="#{DatasetPage.lockedFromEdits}" rendered="#{DatasetPage.sessionUserAuthenticated 
                                                                                     and DatasetPage.canUpdateDataset()
                                                                                     and !widgetWrapper.widgetView}">
@@ -321,7 +321,7 @@
                                     and DatasetPage.workingVersion.fileMetadatas.size() > 1) and DatasetPage.downloadButtonAvailable
                                     and !DatasetPage.isHasTabular()}">
                     <p:commandLink rendered="#{!(DatasetPage.downloadPopupRequired)}"
-                                    type="button" styleClass="btn btn-default btn-download"
+                                    styleClass="btn btn-default btn-download"
                                     disabled="#{false and DatasetPage.lockedFromDownload}"
                                     update="@form"
                                     actionListener="#{DatasetPage.validateFilesForDownload(false, false)}">
@@ -329,7 +329,7 @@
                     </p:commandLink>
                     <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
                     <p:commandLink rendered="#{DatasetPage.downloadPopupRequired}"
-                                    type="button" styleClass="btn btn-default btn-download"
+                                    styleClass="btn btn-default btn-download"
                                     disabled="#{false and DatasetPage.lockedFromDownload}"
                                     action="#{DatasetPage.validateFilesForDownload(true, false)}"
                                     update="@form" oncomplete="">
@@ -378,13 +378,13 @@
                 </div>
 
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiButtonRequired}"
-                                type="button" styleClass="btn btn-default btn-request"                                   
+                                styleClass="btn btn-default btn-request"                                   
                                 update="@form" action="#{DatasetPage.requestAccessMultipleFiles()}"
                                 disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
                 <p:commandLink rendered="#{DatasetPage.fileAccessRequestMultiSignUpButtonRequired}"
-                                type="button" styleClass="btn btn-default btn-request"
+                                styleClass="btn btn-default btn-request"
                                 onclick="PF('accessSignUpLogIn_popup').show()"
                                 disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 8af7416e75f..7528e4057c3 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -27,6 +27,7 @@
                 </f:metadata>
 
                 <h:form id="guestbookForm">
+                    <p:focus context="guestbookForm"/>
                     <!-- Header / Button Panel -->
                     <ui:fragment rendered="#{empty GuestbookPage.editMode}">
                         <!-- View mode -->
@@ -184,16 +185,14 @@
                             </div>
                         </div>
                     </div>
-
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty GuestbookPage.editMode}">
-                        <h:commandButton type="submit" action="#{GuestbookPage.save()}" class="btn btn-default"
+                        <h:commandButton type="submit" action="#{GuestbookPage.save()}" styleClass="btn btn-default"
                                          value="#{GuestbookPage.editMode == 'CREATE' ? bundle['dataset.manageGuestbooks.createBtn'] : bundle.saveChanges}">
                             <f:param name="SKIP_VALIDATION" value="true"/>
                         </h:commandButton>
-                        <h:button class="btn btn-default" value="#{bundle.cancel}" outcome="/manage-guestbooks.xhtml?dataverseId=#{GuestbookPage.dataverse.id}" />
+                        <h:button class="btn btn-link" value="#{bundle.cancel}" outcome="/manage-guestbooks.xhtml?dataverseId=#{GuestbookPage.dataverse.id}"/>
                     </div>
-
                 </h:form>
             </ui:define>
         </ui:composition>
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 86c527682e5..2f2fcd533d0 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -85,7 +85,7 @@
                                     <div id="datatable_length" class="dataTables_length">
                                         <!-- FIXME -->
                                         <!-- removed render logic {harvestingClientsPage.dataverseId != null} -->
-                                        <p:commandLink style="margin-left:1em;" type="button" id="addClient" styleClass="btn btn-default"
+                                        <p:commandLink style="margin-left:1em;" id="addClient" styleClass="btn btn-default"
                                                         actionListener="#{harvestingClientsPage.initNewClient}"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();">
@@ -115,14 +115,14 @@
                             <div class="button-block">
                                 <div class="btn-group" role="group">
                                     <!-- TODO: a confirmation dialog? - "sure you want to run harvest now?" -->
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.runHarvest(harvestClient)}"
                                                    update=":harvestingClientsForm,:messagePanel,:harvestingClientsForm:clientsTable"
                                                    title="#{bundle['harvestclients.tab.header.action.btn.run']}">
                                         <span class="glyphicon glyphicon-play no-text"></span>
                                     </p:commandLink>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.editClient(harvestClient)}"
                                                    oncomplete="PF('newHarvestingClientForm').show();handleResizeDialog('newHarvestingClientDialog');bind_bsui_components();"
@@ -130,7 +130,7 @@
                                                    title="#{bundle['harvestclients.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
                                     </p:commandLink>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{harvestClient.harvestingNow or harvestClient.deleteInProgress}"
                                                    action="#{harvestingClientsPage.setClientForDelete(harvestClient)}"
                                                    oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
@@ -165,8 +165,8 @@
                             </h:outputFormat>
                         </p -->
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingClientsPage.deleteClient()}" update=":harvestingClientsForm :messagePanel" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingClientsForm"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingClientsPage.deleteClient()}" update=":harvestingClientsForm :messagePanel"/>
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingClientsForm"/>
                         </div>
                     </p:dialog>
 
@@ -174,7 +174,7 @@
                     <p:dialog id="newHarvestingClientDialog" widgetVar="newHarvestingClientForm"
                               modal="true" width="85%"
                               header="#{harvestingClientsPage.createMode ? bundle['harvestclients.newClientDialog.title.new'] : bundle['harvestclients.viewEditDialog.title']}">
-                        <p:focus for="nickname"/>
+                        <p:focus context="newHarvestingClientDialog"/>
                         <p:fragment id="newHarvestingClientDialogContent">
                             <p class="help-block">
                                 <h:outputText value="#{bundle['harvestclients.newClientDialog.help']}"/>
@@ -278,7 +278,7 @@
 
                                 <div class="form-group">
                                     <div class="col-sm-9 col-sm-offset-2 button-block">
-                                        <p:commandLink type="button" rendered="#{!harvestingClientsPage.initialSettingsValidated}"
+                                        <p:commandLink rendered="#{!harvestingClientsPage.initialSettingsValidated}"
                                                         id="validateInitialSettingsBtn"
                                                         styleClass="btn btn-default"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
@@ -286,11 +286,9 @@
                                                         action="#{harvestingClientsPage.validateInitialSettings()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button"
-                                                class="btn btn-link"
+                                        <button class="btn btn-link"
                                                 jsf:rendered="#{!harvestingClientsPage.initialSettingsValidated}"
-                                                onclick="PF('newHarvestingClientForm').hide()"
-                                                value="#{bundle.cancel}">
+                                                onclick="PF('newHarvestingClientForm').hide()" type="button">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
@@ -357,16 +355,14 @@
 
                                 <div class="form-group">
                                     <div class="col-sm-6 col-sm-offset-3 button-block">
-                                        <p:commandLink type="button"
-                                                        id="createStepTwoPrevious"
+                                        <p:commandLink id="createStepTwoPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
                                                         action="#{harvestingClientsPage.backToStepOne()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
-                                        <p:commandLink type="button"
-                                                        id="createStepTwoNext"
+                                        <p:commandLink id="createStepTwoNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
@@ -374,7 +370,7 @@
                                             <f:param name="DO_VALIDATION" value="true"/>
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button" class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">
+                                        <button class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" type="button">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
@@ -527,8 +523,7 @@
 
                                 <div class="form-group">
                                     <div class="col-sm-6 col-sm-offset-3 button-block">
-                                        <p:commandLink type="button"
-                                                        id="createStepFourPrevious"
+                                        <p:commandLink id="createStepFourPrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
@@ -536,7 +531,7 @@
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
                                         <!-- note that there are 2 different buttons rendered for "create" and "save"! -->
-                                        <p:commandLink type="button" styleClass="btn btn-default"
+                                        <p:commandLink styleClass="btn btn-default"
                                                        rendered="#{harvestingClientsPage.createMode and harvestingClientsPage.initialSettingsValidated}"
                                                        value="#{bundle['harvestclients.newClientDialog.btn.create']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
@@ -544,13 +539,15 @@
                                                        oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();">
                                             <f:param name="DO_VALIDATION" value="true"/>
                                         </p:commandLink>
-                                        <p:commandLink type="button" styleClass="btn btn-default"
+                                        <p:commandLink styleClass="btn btn-default"
                                                        rendered="#{harvestingClientsPage.editMode and harvestingClientsPage.initialSettingsValidated}"
                                                        value="#{bundle['harvestclients.viewEditDialog.btn.save']}"
                                                        update="newHarvestingClientDialogContent :messagePanel :harvestingClientsForm clientsTable emptyClientsTable"
                                                        actionListener="#{harvestingClientsPage.saveClient}"
                                                        oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newHarvestingClientForm').hide(); else PF('newHarvestingClientForm').show();bind_bsui_components();"/>
-                                        <button type="button" class="btn btn-link" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                        <button class="btn btn-link" jsf:rendered="#{harvestingClientsPage.initialSettingsValidated}" onclick="PF('newHarvestingClientForm').hide()" type="button">
+                                            #{bundle.cancel}
+                                        </button>
                                     </div>
                                 </div>
                             </fieldset>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index bf9db5f06b9..9e74d4cfa3f 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -49,12 +49,12 @@
                     </ui:remove>
                 </h:form>
                 
-                <h:form id="harvestingSetsForm" rendered="#{true}">
+                <h:form id="harvestingSetsForm">
                     <p:fragment id="emptySetsTable" rendered="#{!harvestingSetsPage.hasNamedOAISets or !harvestingSetsPage.harvestingServerEnabled}">
                         <!-- we DON'T want to show the "add set" button until the service is enabled! -->
                         <div class="row" jsf:rendered="#{!harvestingSetsPage.hasNamedOAISets and harvestingSetsPage.harvestingServerEnabled}">
                             <div class="col-sm-12 text-right">
-                                <p:commandLink type="button" id="addSetEmpty" styleClass="btn btn-default margin-bottom"
+                                <p:commandLink id="addSetEmpty" styleClass="btn btn-default margin-bottom"
                                                actionListener="#{harvestingSetsPage.initNewSet}"
                                                update=":harvestingSetsForm:newOAISetDialog"
                                                oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
@@ -108,7 +108,7 @@
                                 </div>
                                 <div class="col-sm-6 text-right">
                                     <div id="datatable_length" class="dataTables_length">                                        
-                                        <p:commandLink type="button" id="addSet" styleClass="btn btn-default"
+                                        <p:commandLink id="addSet" styleClass="btn btn-default"
                                                        actionListener="#{harvestingSetsPage.initNewSet}"
                                                        update=":harvestingSetsForm:newOAISetDialog"
                                                        oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();">
@@ -147,14 +147,14 @@
                             <div class="button-block">
                                 <div class="btn-group" role="group">
                                     <!-- TODO: a confirmation dialog? - "sure you want to run export now?" -->
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.startSetExport(oaiSet)}"
                                                    update=":harvestingSetsForm  :messagePanel :harvestingSetsForm:setsTable"
                                                    title="#{bundle['harvestserver.tab.header.action.btn.export']}">
                                         <span class="glyphicon glyphicon-play no-text"></span>
                                     </p:commandLink>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.editSet(oaiSet)}"
                                                    oncomplete="PF('newOAISetForm').show();handleResizeDialog('newOAISetDialog');bind_bsui_components();"
@@ -162,7 +162,7 @@
                                                    title="#{bundle['harvestserver.tab.header.action.btn.edit']}">
                                         <span class="glyphicon glyphicon-pencil no-text"></span>
                                     </p:commandLink>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    disabled="#{oaiSet.defaultSet or oaiSet.updateInProgress or oaiSet.deleteInProgress}"
                                                    action="#{harvestingSetsPage.setSelectedSet(oaiSet)}"
                                                    oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
@@ -184,8 +184,8 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingSetsPage.deleteSet()}" update=":harvestingSetsForm :messagePanel" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingSetsForm"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{harvestingSetsPage.deleteSet()}" update=":harvestingSetsForm :messagePanel"/>
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" update=":harvestingSetsForm"/>
                         </div>
                     </p:dialog>
 
@@ -242,18 +242,15 @@
                                 
                                 <div class="form-group" jsf:rendered="#{!harvestingSetsPage.setQueryValidated}">
                                     <div class="col-sm-8 col-sm-offset-3 button-block">
-                                        <p:commandLink type="button" 
-                                                         id="validateSetQueryBtn"
+                                        <p:commandLink id="validateSetQueryBtn"
                                                          styleClass="btn btn-default"
                                                          oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
                                                          update=":harvestingSetsForm:newOAISetDialog"
                                                          action="#{harvestingSetsPage.validateSetQuery()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button" 
-                                                class="btn btn-link" 
-                                                onclick="PF('newOAISetForm').hide()" 
-                                                value="#{bundle.cancel}">
+                                        <button class="btn btn-link" 
+                                                onclick="PF('newOAISetForm').hide()" type="button">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
@@ -296,15 +293,14 @@
                                     <div class="form-group">
                                         <div class="col-sm-6 col-sm-offset-3 button-block">
                                             <!-- note that there are 2 different buttons rendered for "create" and "save"! -->
-                                            <p:commandLink type="button"
-                                                        id="backToQuery"
+                                            <p:commandLink id="backToQuery"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingSetsForm:newOAISetDialog"
                                                         oncomplete="PF('newOAISetForm').show();bind_bsui_components();"
                                                         action="#{harvestingSetsPage.backToQuery()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                             </p:commandLink>
-                                            <p:commandLink type="button" styleClass="btn btn-default"
+                                            <p:commandLink styleClass="btn btn-default"
                                                            rendered="#{harvestingSetsPage.createMode and harvestingSetsPage.setQueryValidated}"
                                                            value="#{bundle['harvestserver.newSetDialog.btn.create']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
@@ -312,13 +308,15 @@
                                                            oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();">
                                                 <f:param name="DO_VALIDATION" value="true"/>
                                             </p:commandLink>
-                                            <p:commandLink type="button" styleClass="btn btn-default"
+                                            <p:commandLink styleClass="btn btn-default"
                                                            rendered="#{harvestingSetsPage.editMode and harvestingSetsPage.setQueryValidated}"
                                                            value="#{bundle['harvestserver.viewEditDialog.btn.save']}"
                                                            update="newOAISetDialogContent :messagePanel :harvestingSetsForm setsTable emptySetsTable"
                                                            actionListener="#{harvestingSetsPage.saveSet}"
                                                            oncomplete="if (args &amp;&amp; !args.validationFailed) PF('newOAISetForm').hide(); else PF('newOAISetForm').show();bind_bsui_components();"/>
-                                            <button type="button" class="btn btn-link" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" onclick="PF('newOAISetForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                                            <button class="btn btn-link" jsf:rendered="#{harvestingSetsPage.setQueryValidated}" onclick="PF('newOAISetForm').hide()" type="button">
+                                                #{bundle.cancel}
+                                            </button>
                                         </div>
                                     </div>
                                 </fieldset>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index ca2ec0cd4e9..f38a49b2b2a 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -22,7 +22,7 @@
                 <h:form id="manageGroupsForm">
                     <div class="form-group clearfix">
                         <div class="pull-right">
-                            <p:commandLink type="button" id="createGroup" styleClass="btn btn-default"
+                            <p:commandLink id="createGroup" styleClass="btn btn-default"
                                            actionListener="#{manageGroupsPage.initExplicitGroupDialog}"
                                            update="explicitGroupNewDialog" oncomplete="PF('explicitGroupForm').show();handleResizeDialog('explicitGroupNewDialog');bind_bsui_components();">
                                 <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.manageGroups.createBtn']}
@@ -68,16 +68,16 @@
                             <p:column width="30%" class="col-manage-action col-button-action text-center" headerText="#{bundle['dataverse.manageGroups.tab.header.action']}">
                                 <div class="button-block">
                                     <div class="btn-group" role="group">
-                                        <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGroupsPage.viewSelectedGroup(explicitGroup)}"
                                                        oncomplete="PF('viewGroup').show();bind_bsui_components();"
                                                        update=":manageGroupsForm"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.edit']}">
                                             <span class="glyphicon glyphicon-edit"></span>
                                         </p:commandLink>
-                                        <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGroupsPage.setSelectedGroup(explicitGroup)}"
-                                                       update="@all"
+                                                       update="@form"
                                                        oncomplete="PF('deleteConfirmation').show()"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.delete']}">
                                             <span class="glyphicon glyphicon-trash"></span>
@@ -92,8 +92,8 @@
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.unrenderDeletePopup()}" update="@all" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="@all"/>
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.unrenderDeletePopup()}" update="@all"/>
                         </div>
                     </p:dialog>
                     <p:dialog id="viewGroup" styleClass="largePopUp" header="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.header']}" widgetVar="viewGroup" modal="true">
@@ -158,8 +158,7 @@
                             <!-- Action  -->
                             <p:column width="13%"
                                       headerText="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.groupView.action']}">
-                                <p:commandLink type="button"
-                                               styleClass="btn btn-default bootstrap-button-tooltip"
+                                <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                update="groupMembers"
                                                action="#{manageGroupsPage.removeMemberFromSelectedGroup(groupMember)}"
                                                title="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.groupView.delete']}">
@@ -169,14 +168,14 @@
                         </p:dataTable>
                         <!-- Add Group Members -->
                         <div class="button-block">
-                            <p:commandLink type="button"
-                                           id="saveGroup"
+                            <p:commandButton id="saveGroup" styleClass="btn btn-default"
                                            actionListener="#{manageGroupsPage.saveExplicitGroup}"
-                                           styleClass="btn btn-default"
                                            value="#{bundle.saveChanges}"
                                            update="@all">
-                            </p:commandLink>
-                            <p:commandLink type="button" styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('viewGroup').hide()" />
+                            </p:commandButton>
+                            <button class="btn btn-link" onclick="PF('viewGroup').hide()" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <!-- Explicit Group Edit Popup -->
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 51eae85b71b..ba4f062a465 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -37,7 +37,7 @@
                         </div>
                         <div class="col-xs-6">
                             <p class="button-block text-right">
-                                <h:outputLink type="button" styleClass="btn btn-default"
+                                <h:outputLink styleClass="btn btn-default"
                                               value="/guestbook.xhtml?ownerId=#{manageGuestbooksPage.dataverse.id}">
                                     <span class="glyphicon glyphicon-plus"/> <h:outputText value="#{bundle['dataset.manageGuestbooks.createBtn']}"/>
                                 </h:outputLink>
@@ -98,38 +98,38 @@
                                     </em>
                                 </div>
                                 <div class="button-block">
-                                    <p:commandLink type="button" styleClass="btn btn-default"
+                                    <p:commandLink styleClass="btn btn-default"
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.enable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and !guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.enableGuestbook(guestbook)}"
                                                    update="@form,:messagePanel"
                                                    oncomplete="bind_tooltip_popover();"/>
-                                    <p:commandLink type="button" styleClass="btn btn-default"
+                                    <p:commandLink styleClass="btn btn-default"
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.disable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.disableGuestbook(guestbook)}"
                                                    update="@form,:messagePanel"
                                                    oncomplete="bind_tooltip_popover();"/>
                                     <div class="btn-group" role="group">
-                                        <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.viewSelectedGuestbook(guestbook)}"
                                                        oncomplete="PF('viewGuestbook').show();bind_bsui_components();"
                                                        update=":manageGuestbooksForm"
                                                        title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view']}">
                                             <span class="glyphicon glyphicon-eye-open no-text"></span>
                                         </p:commandLink>
-                                        <h:outputLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <h:outputLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                       value="/guestbook.xhtml?ownerId=#{manageGuestbooksPage.dataverse.id}&#38;sourceId=#{guestbook.id}"
                                                       title="#{bundle['dataset.manageGuestbooks.tab.action.btn.copy']}">
                                             <span class="glyphicon glyphicon-duplicate no-text"></span>
                                         </h:outputLink>
-                                        <h:outputLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <h:outputLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                       rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id}"
                                                       value="/guestbook.xhtml?id=#{guestbook.id}&#38;ownerId=#{manageGuestbooksPage.dataverse.id}"
                                                       title="#{bundle['dataset.manageGuestbooks.tab.action.btn.edit']}">
                                             <span class="glyphicon glyphicon-pencil no-text"></span>
                                         </h:outputLink>
-                                        <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                        <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.setSelectedGuestbook(guestbook)}"
                                                        rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.deletable}"
                                                        oncomplete="PF('deleteConfirmation').show();bind_bsui_components();"
@@ -150,8 +150,10 @@
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.manageGuestbooks.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGuestbooksPage.deleteGuestbook()}" update="@all"/>
+                            <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
@@ -220,7 +222,9 @@
                             </div>
                         </div>
                         <div class="button-block">
-                            <p:commandButton type="button" styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('viewGuestbook').hide()" />
+                            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 62538d5f532..8bffc68a3c1 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -33,7 +33,7 @@
                         </ui:fragment>
 
                         <div class="pull-right">
-                            <h:outputLink type="button" styleClass="btn btn-default"
+                            <h:outputLink styleClass="btn btn-default"
                                           value="/template.xhtml?ownerId=#{manageTemplatesPage.dataverse.id}">
                                 <span class="glyphicon glyphicon-plus"/> <h:outputText value="#{bundle['dataset.manageTemplates.createBtn']}"/>
                             </h:outputLink>
@@ -83,13 +83,13 @@
                                         </h:outputFormat>
                                     </em>
                                 </div>
-                                <p:commandLink type="button" styleClass="btn btn-default"
+                                <p:commandLink styleClass="btn btn-default"
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.makeDefault']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate != template}"
                                                actionListener="#{manageTemplatesPage.makeDefault(template)}"
                                                update="@form,:messagePanel"
                                                oncomplete="bind_tooltip_popover();bind_bsui_components();"/>
-                                <p:commandLink type="button" styleClass="btn btn-default"
+                                <p:commandLink styleClass="btn btn-default"
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.default']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate == template}"
                                                actionListener="#{manageTemplatesPage.unselectDefault(template)}"
@@ -98,14 +98,14 @@
                                     <span class="glyphicon glyphicon-eye-open"></span>
                                 </p:commandLink>
                                 <div class="btn-group" role="group">
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.view']}"
                                                    action="#{manageTemplatesPage.viewSelectedTemplate(template)}"
                                                    oncomplete="PF('viewTemplate').show();bind_tooltip_popover();bind_bsui_components();"
                                                    update=":manageTemplatesForm">
                                         <span class="glyphicon glyphicon-eye-open"></span>
                                     </p:commandLink>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.copy']}"
                                                    action="#{manageTemplatesPage.cloneTemplate(template)}"
                                                    update="@form"
@@ -129,7 +129,7 @@
                                             </li>
                                         </ul>
                                     </div>
-                                    <p:commandLink type="button" styleClass="btn btn-default bootstrap-button-tooltip"
+                                    <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.delete']}"
                                                    update="@form,:messagePanel"
                                                    action="#{manageTemplatesPage.setSelectedTemplate(template)}"
@@ -159,8 +159,10 @@
                             </ul>
                         </ui:fragment>
                         <div class="button-block">
-                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all" />
-                            <p:commandLink styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()" type="button" />
+                            <p:commandButton id="contDeleteTemplateBtn" styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageTemplatesPage.deleteTemplate()}" update="@all"/>
+                            <button class="btn btn-link" onclick="PF('deleteConfirmation').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <p:dialog id="viewTemplate" styleClass="largePopUp" header="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.header']}" widgetVar="viewTemplate" modal="true">
@@ -185,7 +187,9 @@
                             <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}" />
                         </ui:include>
                         <div class="button-block">
-                            <p:commandButton type="button" styleClass="btn btn-default" value="#{bundle.close}" onclick="PF('viewTemplate').hide()" />
+                            <button class="btn btn-default" onclick="PF('viewTemplate').hide()" type="button">
+                                #{bundle.close}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml
index 25e1c129494..d0b97f969c4 100644
--- a/src/main/webapp/oauth2/convert.xhtml
+++ b/src/main/webapp/oauth2/convert.xhtml
@@ -28,6 +28,7 @@
                 <p:tabView id="tabView">
                     <p:tab id="convertAccountTab" title="#{bundle['account.info']}">
                         <h:form id="convertAccountForm" styleClass="form-horizontal">
+                            <p:focus context="convertAccountForm"/>
                             <p class="help-block">
                                 <h:outputFormat value="#{OAuth2FirstLoginPage.convertTip}" escape="false"/>
                             </p>
@@ -58,7 +59,6 @@
                                 </div>
                             </div>
                             
-                            
                             <div class="form-group">
                                 <div class="col-sm-offset-3 col-sm-9">
                                     <a href="/passwordreset.xhtml">
@@ -70,8 +70,8 @@
                                 <div class="col-md-12 button-block">
                                     <p:commandButton value="#{bundle['oauth2.convertAccount.buttonTitle']}" styleClass="btn btn-default"
                                                      action="#{OAuth2FirstLoginPage.convertExistingAccount}"
-                                                     ajax="false" update="@all" />
-                                    <p:commandButton value="#{bundle['cancel']}" styleClass="btn btn-default"
+                                                     ajax="false" update="@all"/>
+                                    <p:commandButton value="#{bundle['cancel']}" styleClass="btn btn-link"
                                                      action="/oauth2/firstLogin.xhtml?faces-redirect=true"/>
                                 </div>
                             </div>
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 53fda7e0d8c..63271ec0206 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -31,6 +31,7 @@
                             #{OAuth2FirstLoginPage.createFromWhereTip}
                         </p>
                         <h:form id="newAccountForm" styleClass="form-horizontal">
+                            <p:focus context="newAccountForm"/>
                             <div class="form-group">
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.username']} 
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 84d8064b42c..8ddfe9eaf51 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -41,6 +41,7 @@
                             </h:outputFormat>
                         </div>
                         <h:form id="passwordReset" styleClass="form-horizontal">
+                            <p:focus context="passwordReset"/>
                             <div class="form-group col-sm-11">
                                 <p:outputLabel value="#{bundle.email}" for="email" styleClass="col-sm-3 control-label"/>
                                 <div class="col-sm-4">
@@ -52,16 +53,13 @@
                             </div>
                             <div class="form-group col-sm-11">
                                 <div class="col-sm-offset-3 col-sm-9 button-block">
-                                    <p:commandButton action="#{PasswordResetPage.sendPasswordResetLink()}" update="@all" value="#{bundle['passwdReset.submitRequest']}"/>
-                                    <p:button value="#{bundle.cancel}" outcome="/loginpage.xhtml"/>
+                                    <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.sendPasswordResetLink()}" update="@all" value="#{bundle['passwdReset.submitRequest']}"/>
+                                    <p:button styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/loginpage.xhtml"/>
                                 </div>
                             </div>
                         </h:form>
                     </div>
                     <ui:fragment rendered="#{not empty PasswordResetPage.emailAddress}">
-                        <h:outputFormat value="#{bundle['passwdReset.successSubmit.tip']}">
-                            <f:param value="#{PasswordResetPage.emailAddress}"/>
-                        </h:outputFormat>
                         <ui:fragment id="debugEmail" rendered="false">
                             <div style="background-color: lightgray">
                                 <tt>
@@ -106,7 +104,8 @@
                             </div>
                         </div>
                         <div>
-                            <h:form styleClass="form-horizontal">
+                            <h:form id="passwordResetForm" styleClass="form-horizontal">
+                                <p:focus context="passwordResetForm"/>
                                 <div class="form-group col-sm-11">
                                     <label for="inputPassword" class="col-sm-3 control-label">
                                         #{bundle['passwdReset.newPasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
@@ -119,9 +118,8 @@
                                         </div>
                                     </div>
                                     <div class="col-sm-4 col-sm-offset-3">
-					    <p:password id="inputPassword" label="#{bundle.passwd}" match="retypePassword" styleClass="form-control" value="#{PasswordResetPage.newPassword}" validator="#{PasswordResetPage.validateNewPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
-					<p:message for="inputPassword" />
-					<p:focus for="inputPassword" />
+                                        <p:password id="inputPassword" label="#{bundle.passwd}" match="retypePassword" styleClass="form-control" value="#{PasswordResetPage.newPassword}" validator="#{PasswordResetPage.validateNewPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
+					<p:message for="inputPassword"/>
                                     </div>
                                 </div>
                                 <div class="form-group col-sm-11">
@@ -129,8 +127,8 @@
                                         #{bundle['passwdReset.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span>
                                     </label>
                                     <div class="col-sm-4">
-					    <p:password id="retypePassword" label="#{bundle['passwdReset.rePasswd']}" styleClass="form-control" value="#{PasswordResetPage.newPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
-                                        <p:message for="retypePassword" />
+                                        <p:password id="retypePassword" label="#{bundle['passwdReset.rePasswd']}" styleClass="form-control" value="#{PasswordResetPage.newPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
+                                        <p:message for="retypePassword"/>
                                     </div>
                                 </div>
                                 <ui:fragment rendered="#{PasswordResetPage.isAccountUpgrade()}">
@@ -139,7 +137,7 @@
                                 </ui:fragment>
                                 <div class="form-group col-sm-11">
                                     <div class="col-sm-10 button-block">
-                                        <p:commandButton action="#{PasswordResetPage.resetPassword()}" update="@all" value="#{bundle['passwdReset.resetBtn']}"/>
+                                        <p:commandButton styleClass="btn btn-default" action="#{PasswordResetPage.resetPassword()}" update="@all" value="#{bundle['passwdReset.resetBtn']}"/>
                                     </div>
                                 </div>
                             </h:form>
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 0a2e2264805..066fd290bb8 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -41,7 +41,7 @@
                                         </div>
                                     </p:fragment>
                                     <div class="margin-bottom text-right">
-                                        <p:commandLink type="button" id="userGroupsAdd" styleClass="btn btn-default"
+                                        <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
                                                        actionListener="#{manageFilePermissionsPage.initAssignDialog}"
                                                        update="assignDialog"
                                                        oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();">
@@ -78,7 +78,7 @@
                                                 </p:column>
                                                 <p:column width="25%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
                                                     <div class="btn-group" role="group" aria-label="access">
-                                                        <p:commandLink type="button" styleClass="btn btn-default"
+                                                        <p:commandLink styleClass="btn btn-default"
                                                                        actionListener="#{manageFilePermissionsPage.grantAccessToAllRequests(access.key)}"
                                                                        update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
                                                                        :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
@@ -86,7 +86,7 @@
                                                                        oncomplete="bind_bsui_components();">
                                                             <span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
                                                         </p:commandLink>
-                                                        <p:commandLink type="button" styleClass="btn btn-default"
+                                                        <p:commandLink styleClass="btn btn-default"
                                                                        actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
                                                                        update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} :#{p:resolveClientId('rolesPermissionsForm:fileAccessRequests', view)}                                                                       
                                                                        :#{p:resolveClientId('rolesPermissionsForm:userGroupsRequests', view)}
@@ -113,7 +113,7 @@
                                                     <h:outputText value="#{ra.key.identifier}"/>
                                                 </p:column>
                                                 <p:column width="20%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
-                                                    <p:commandLink id="viewUserGroups"
+                                                    <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
                                                                    actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByRoleAssignee(ra.key, ra.value)}"
                                                                    update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
                                                                    oncomplete="PF('viewRemoveWidget').show(); bind_bsui_components();">
@@ -121,11 +121,11 @@
                                                     </p:commandLink>
                                                 </p:column>
                                                 <p:column width="30%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.access']}">
-                                                    <p:commandLink type="button" styleClass="btn btn-default"
+                                                    <p:commandLink styleClass="btn btn-default"
                                                                    update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
                                                                    actionListener="#{manageFilePermissionsPage.showUserGroupMessages}"
                                                                    onclick="PF('confirmation').show()">
-                                                                   <f:setPropertyActionListener value="#{ra.value}" target="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" />
+                                                        <f:setPropertyActionListener value="#{ra.value}" target="#{manageFilePermissionsPage.selectedRoleAssignmentRows}" />
                                                         <span class="glyphicon glyphicon-remove"/> #{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}
                                                     </p:commandLink>
                                                 </p:column>
@@ -189,7 +189,7 @@
                                             <h:outputText rendered="#{fileEntry.value.size() == 0}" value="#{fileEntry.value.size()} #{bundle['dataverse.permissionsFiles.files.roleAssignees']}"/>
                                         </p:column>
                                         <p:column width="22%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.access']}">
-                                            <p:commandLink type="button" styleClass="btn btn-default"
+                                            <p:commandLink styleClass="btn btn-default"
                                                            actionListener="#{manageFilePermissionsPage.initAssignDialogByFile(fileEntry.key)}"
                                                            update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
                                                            oncomplete="PF('assignWidget').show();handleResizeDialog('assignDialog');bind_bsui_components();"><span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.permissionsFiles.files.assignBtn']}</p:commandLink>
@@ -231,17 +231,19 @@
                             </p:dataTable>
                         </div>
                         <div class="button-block">
-                            <p:commandLink type="button" styleClass="btn btn-default"
+                            <p:commandLink styleClass="btn btn-default"
                                            update="userGroups restrictedFiles @([id$=Messages])" onclick="PF('confirmation').show()">
                                 <span class="glyphicon glyphicon-remove"/>
                                 <h:outputText value="#{bundle['dataverse.permissionsFiles.viewRemoveDialog.removeBtn']}"/>
                             </p:commandLink>
-                            <button type="button" class="btn btn-link" onclick="PF('viewRemoveWidget').hide()" value="Cancel">#{bundle.cancel}</button>
+                            <button class="btn btn-link" onclick="PF('viewRemoveWidget').hide()" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                     <!-- Assign Users/Groups Popup -->
                     <p:dialog id="assignDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissionsFiles.assignDialog.header']}" widgetVar="assignWidget" modal="true">
-                        <p:focus for="userGroupNameAssign"/>
+                        <p:focus context="assignDialog"/>
                         <p:fragment id="assignMessages">
                             <div class="messagePanel">
                                 <iqbs:messages collapsible="true" />
@@ -317,26 +319,28 @@
                                 </p:dataTable>
                             </div>
                             <div class="button-block">
-                                <p:commandLink type="button" styleClass="btn btn-default" rendered="#{empty manageFilePermissionsPage.fileRequester}"
+                                <p:commandLink styleClass="btn btn-default" rendered="#{empty manageFilePermissionsPage.fileRequester}"
                                                update="assignRoleContent userGroups restrictedFiles @([id$=Messages])"
                                                actionListener="#{manageFilePermissionsPage.grantAccess}" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('assignWidget').hide();">
                                     <f:param name="DO_VALIDATION" value="true"/>
                                     <span class="glyphicon glyphicon-ok"/>
                                     <h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}"/>
                                 </p:commandLink>
-                                <p:commandLink type="button" styleClass="btn btn-default" rendered="#{!empty manageFilePermissionsPage.fileRequester}"
+                                <p:commandLink styleClass="btn btn-default" rendered="#{!empty manageFilePermissionsPage.fileRequester}"
                                                update="assignRoleContent userGroups fileAccessRequests restrictedFiles @([id$=Messages])"
                                                actionListener="#{manageFilePermissionsPage.grantAccessToRequests(manageFilePermissionsPage.fileRequester)}" oncomplete="PF('assignWidget').hide();">
                                     <span class="glyphicon glyphicon-ok"/>
                                     <h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}"/>
                                 </p:commandLink>
-                                <p:commandLink type="button" styleClass="btn btn-default" rendered="#{!empty manageFilePermissionsPage.fileRequester}"
+                                <p:commandLink styleClass="btn btn-default" rendered="#{!empty manageFilePermissionsPage.fileRequester}"
                                                update="assignRoleContent userGroups fileAccessRequests restrictedFiles @([id$=Messages])"
                                                actionListener="#{manageFilePermissionsPage.rejectAccessToRequests(manageFilePermissionsPage.fileRequester)}" oncomplete="PF('assignWidget').hide();">
                                     <span class="glyphicon glyphicon-ban-circle"/>
                                     <h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}"/>
                                 </p:commandLink>
-                                <button type="button" class="btn btn-link" onclick="PF('assignWidget').hide()" value="Cancel">#{bundle.cancel}</button>
+                                <button class="btn btn-link" onclick="PF('assignWidget').hide()" type="button">
+                                    #{bundle.cancel}
+                                </button>
                             </div>
                         </p:fragment>
                     </p:dialog>
@@ -350,7 +354,9 @@
                                              process="@this"
                                              update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @([id$=Messages])"
                                              oncomplete="PF('viewRemoveWidget').hide();"/>
-                            <p:commandLink type="button" styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('confirmation').hide()" />
+                            <button class="btn btn-link" onclick="PF('confirmation').hide();" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index e65380f5aaf..25788bedac5 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -41,7 +41,7 @@
                                                     <iqbs:messages  collapsible="true" rendered="#{managePermissionsPage.renderConfigureMessages}"/>
                                                 </div>
                                             </p:fragment>
-                                            <p:commandLink type="button" id="configureButton" styleClass="btn btn-default pull-right"
+                                            <p:commandLink id="configureButton" styleClass="btn btn-default pull-right"
                                                            actionListener="#{managePermissionsPage.initAccessSettings}"
                                                            update="accessDialog"
                                                            oncomplete="PF('accessForm').show();">
@@ -102,7 +102,7 @@
                                         </div>
                                     </p:fragment>
                                     <div class="margin-bottom text-right">
-                                        <p:commandLink type="button" id="userGroupsAdd" styleClass="btn btn-default"
+                                        <p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
                                                        actionListener="#{managePermissionsPage.initAssigneeDialog}"
                                                        update="userGroupDialog"
                                                        oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');bind_bsui_components();">
@@ -131,7 +131,7 @@
                                                 <h:outputFormat styleClass="text-muted italic" value="#{bundle['dataverse.permissions.usersOrGroups.assignedAt']}" rendered="#{managePermissionsPage.dvObject ne roleAssignment.definitionPoint}">
                                                     <f:param value="#{roleAssignment.assignedDvName}"/>
                                                 </h:outputFormat>
-                                                <p:commandLink type="button" styleClass="btn btn-default"                                           
+                                                <p:commandLink styleClass="btn btn-default"
                                                                rendered="#{managePermissionsPage.dvObject eq roleAssignment.definitionPoint}"
                                                                onclick="PF('confirmation').show()">
                                                     <f:setPropertyActionListener value="#{roleAssignment.roleAssignment}" target="#{managePermissionsPage.selectedRoleAssignment}" />
@@ -159,7 +159,7 @@
                                         </div>
                                     </p:fragment>
                                     <div class="margin-bottom text-right">
-                                        <p:commandLink type="button" id="rolesAdd" styleClass="btn btn-default"
+                                        <p:commandLink id="rolesAdd" styleClass="btn btn-default"
                                                        rendered="#{managePermissionsPage.dvObject.instanceofDataverse and permissionsWrapper.canManagePermissions(managePermissionsPage.dvObject)
                                                                     and dataverseSession.user.superuser}"
                                                        actionListener="#{managePermissionsPage.createNewRole}"
@@ -204,11 +204,13 @@
                     <p:dialog id="accessDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissions.accessDialog.header']}" widgetVar="accessForm" modal="true">
                         <ui:include src="permissions-configure.xhtml"/>
                         <div class="button-block">
-                            <p:commandLink value="#{bundle['saveChanges']}" styleClass="btn btn-default"
+                            <p:commandButton value="#{bundle['saveChanges']}" styleClass="btn btn-default"
                                            update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} @([id$=assignedRoles]) assignedRoles @([id$=Messages])"
                                            actionListener="#{managePermissionsPage.saveConfiguration}"
                                            oncomplete="PF('accessForm').hide()"/>
-                            <button type="button" class="btn btn-link" onclick="PF('accessForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                            <button class="btn btn-link" onclick="PF('accessForm').hide()" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
 
@@ -225,7 +227,9 @@
                             <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmation').hide()" 
                                              action="#{managePermissionsPage.removeRoleAssignment()}" 
                                              update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} assignedRoles @([id$=Messages])" />
-                            <button type="button" class="btn btn-link" onclick="PF('confirmation').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                            <button class="btn btn-link" onclick="PF('confirmation').hide()" type="button">
+                                #{bundle.cancel}
+                            </button>
                         </div>
                     </p:dialog>
                 </h:form>
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml
index fb7a2148f69..c7caa1b2ded 100644
--- a/src/main/webapp/provenance-popups-fragment.xhtml
+++ b/src/main/webapp/provenance-popups-fragment.xhtml
@@ -136,7 +136,7 @@
             </div>
             <div class="button-block">              
                 <p:commandButton styleClass="btn btn-default" id="editProvenancePopupSaveButton" value="#{bundle.continue}" disabled="#{provPopupFragmentBean.isDataFilePublishedWithDraftRendering() and !provPopupFragmentBean.isDatasetInDraftRendering()}" update="provPopupOutput,assignMessages,confirmProvenancePopup" oncomplete="if (args &amp;&amp; !args.validationFailed) { PF('editProvenancePopup').hide();PF('confirmProvenancePopup').show();}"/>
-                <p:commandLink styleClass="btn btn-link" id="editProvenancePopupCancelButton" value="#{bundle.cancel}" update="provPopupOutput,assignMessages,confirmProvenancePopup" onclick="PF('editProvenancePopup').hide();" immediate="true" actionListener="#{provPopupFragmentBean.removeJsonAndRelatedData()}"/>
+                <p:commandButton styleClass="btn btn-link" id="editProvenancePopupCancelButton" value="#{bundle.cancel}" update="provPopupOutput,assignMessages,confirmProvenancePopup" onclick="PF('editProvenancePopup').hide();" immediate="true" actionListener="#{provPopupFragmentBean.removeJsonAndRelatedData()}"/>
             </div>
         </div>
     </p:dialog>
@@ -173,7 +173,9 @@
         </div>
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" id="confirmProvenancePopupSaveButton" value="#{bundle.saveChanges}" oncomplete="PF('confirmProvenancePopup').hide();" action="#{provPopupFragmentBean.stagePopupChanges(saveInPopup == 'true')}" update=":messagePanel"/>
-            <p:commandLink styleClass="btn btn-link" id="confirmProvenancePopupCancelButton" value="#{bundle.cancel}" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();"/>
+            <button jsf:id="confirmProvenancePopupCancelButton" class="btn btn-link" onclick="PF('editProvenancePopup').show();PF('confirmProvenancePopup').hide();" type="button">
+                #{bundle.cancel}
+            </button>
         </div>
     </p:dialog>
 </ui:composition>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 200eeea0e50..db156b81dc9 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -858,6 +858,10 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
 .ui-confirm-dialog-severity {margin-top:3px;}
 .ui-widget-content a.btn-default {color:#333;}
 .input-group-btn > .btn, .input-group-btn > .btn-group {border-top-left-radius: 0;border-bottom-left-radius: 0;margin-left: -1px;font-size:14px;}
+.ui-button.btn-link, .ui-button.btn-link.active, .ui-button.btn-link:active, .ui-button.btn-link[disabled], fieldset[disabled] .ui-button.btn-link {padding:0; border:0; border-color:transparent; border-radius:0; background-color:transparent; background-image:none; box-shadow: none; color: #337ab7;}
+.ui-button.btn-link, .ui-button.btn-link:hover, .ui-button.btn-link:focus, .ui-button.btn-link:active {border-color: transparent;}
+.ui-button.btn-link:hover, .ui-button.btn-link:focus {color: #23527c; text-decoration: underline !important; background-color: transparent;}
+.ui-button.btn-link[disabled]:hover, fieldset[disabled] .ui-button.btn-link:hover, .ui-button.btn-link[disabled]:focus, fieldset[disabled] .ui-button.btn-link:focus {color: #777;text-decoration: none;}
 .ui-widget-header .form-group {font-weight:normal;}
 /* .ui-messages-info-detail, .ui-messages-warn-detail, .ui-messages-error-detail, .ui-messages-fatal-detail, .ui-message-info-detail, .ui-message-warn-detail, .ui-message-error-detail, .ui-message-fatal-detail {
     margin-left: 0px;
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index 435878064c0..4f9f011ab48 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -91,13 +91,15 @@
                 </div>
             </div>
             <div class="button-block">
-                <p:commandLink type="button" styleClass="btn btn-default" value="#{bundle.saveChanges}"
+                <p:commandButton styleClass="btn btn-default" value="#{bundle.saveChanges}"
                                update="assignRoleContent assignedRoles @([id$=Messages])"
                                actionListener="#{managePermissionsPage.assignRole}" 
                                oncomplete="if (args &amp;&amp; !args.validationFailed) PF('userGroupsForm').hide();">
                     <f:param name="DO_ASSIGN_VALIDATION" value="true"/>
-                </p:commandLink>
-                <button type="button" class="btn btn-link" onclick="PF('userGroupsForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                </p:commandButton>
+                <button type="button" class="btn btn-link" onclick="PF('userGroupsForm').hide()">
+                    #{bundle.cancel}
+                </button>
             </div>
         </p:fragment>
     </p:dialog>
@@ -112,7 +114,9 @@
             <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmFileDownloader').hide()"
                              action="#{managePermissionsPage.assignRole}"
                              update="assignRoleContent assignedRoles @([id$=Messages])" />
-            <button type="button" class="btn btn-link" onclick="PF('confirmFileDownloader').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+            <button class="btn btn-link" onclick="PF('confirmFileDownloader').hide()" type="button">
+                #{bundle.cancel}
+            </button>
         </div>
     </p:dialog>
 </ui:composition>
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 358943842f9..34c361731c0 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -63,12 +63,14 @@
                 </h:selectManyCheckbox>
             </p:panel>
             <div id="editRoleButtonPanel" class="button-block">
-                <p:commandLink type="button" styleClass="btn btn-default" 
+                <p:commandButton styleClass="btn btn-default" 
                                value="#{bundle.saveChanges}" 
                                oncomplete="PF('roleForm').hide()"
                                update="roleDisplay availableRoles @([id$=Messages])"
                                actionListener="#{managePermissionsPage.updateRole}"/>
-                <button type="button" class="btn btn-link" onclick="PF('roleForm').hide()" value="#{bundle.cancel}">#{bundle.cancel}</button>
+                <button class="btn btn-link" onclick="PF('roleForm').hide()" type="button">
+                    #{bundle.cancel}
+                </button>
             </div>
         </p:panel>
     </p:dialog>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index b3a013f2791..f03c67f1c7b 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -232,7 +232,7 @@
 
             <!--toggle sidebar button-->
             <p class="visible-xs-block">
-              <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas"><i class="glyphicon glyphicon-chevron-left"></i> Filter Results</button>
+              <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas"><i class="glyphicon glyphicon-chevron-left"></i> #{bundle['dataverse.results.btn.filterResults']}</button>
             </p>
 
             <!-- Message for zero results -->
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 1f9c3dbf8d3..b8564406f64 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -25,6 +25,7 @@
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(TemplatePage.template.dataverse, (TemplatePage.editMode == 'CREATE' ? bundle['dataset.manageTemplates.createBtn'] : TemplatePage.template.name))}"/>
                 </f:metadata>
                 <h:form id="templateForm">
+                    <p:focus context="templateForm"/>
                     <!-- Header / Button Panel -->
                     <ui:fragment rendered="#{empty TemplatePage.editMode}">
                         <!-- View mode -->
@@ -110,27 +111,20 @@
 
                         </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
-                    <ui:fragment rendered="#{TemplatePage.editMode == 'CREATE'}" >
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default"  action="#{TemplatePage.save('Terms')}" update="@all"
-                                         value="#{bundle['dataset.create.add.terms'] }">  
-                             <f:ajax onerror="window.scrollTo(0, 0)" />
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update="@all"
+                                         value="#{bundle['dataset.create.add.terms']}"
+                                         rendered="#{TemplatePage.editMode == 'CREATE'}">  
+                             <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <h:button styleClass="btn btn-default" value="#{bundle.cancel}" 
-                                  outcome="/manage-templates.xhtml?dataverseId=#{TemplatePage.dataverse.id}"></h:button>
-                    </div>
-                    </ui:fragment>
-                    <ui:fragment rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}" >
-                    <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
-                        <p:commandButton styleClass="btn btn-default"  action="#{TemplatePage.save('')}" update="@all"
-                                         value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}">
-                            <f:ajax onerror="window.scrollTo(0, 0)" />
+                        <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('')}" update="@all"
+                                         value="#{TemplatePage.editMode == 'LICENSEADD' ? bundle['dataset.manageTemplates.saveNewTerms'] : bundle.saveChanges}"
+                                         rendered="#{TemplatePage.editMode == 'METADATA' or TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
+                            <f:ajax onerror="window.scrollTo(0, 0)"/>
                         </p:commandButton>
-                        <h:button styleClass="btn btn-default" value="#{bundle.cancel}" 
+                        <h:button styleClass="btn btn-link" value="#{bundle.cancel}" 
                                   outcome="/manage-templates.xhtml?dataverseId=#{TemplatePage.dataverse.id}"></h:button>
                     </div>
-                    </ui:fragment>
-
                 </h:form>
             </ui:define>
         </ui:composition>
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 17d38c73150..0cf8015e812 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -5,10 +5,11 @@
     xmlns:p="http://primefaces.org/ui"
     xmlns:o="http://omnifaces.org/ui">
     <!-- Theme and Widgets Edit Tabs -->
-        <p:tabView  rendered="#{themeWidgetFragment.editDv!=null}" id="themeWidgetsTabView" widgetVar="content">
+        <p:tabView id="themeWidgetsTabView" rendered="#{themeWidgetFragment.editDv!=null}" widgetVar="content">
             <p:tab id="themeTab" title="#{bundle['dataverse.theme.title']}" rendered="#{not settingsWrapper.rootDataverseThemeDisabled or themeWidgetFragment.editDv.owner != null}">
                 <p:fragment>
                     <p:autoUpdate/>
+                    <p:focus for="themeRoot"/>
                     <!-- Dataverse Theme Panel -->
                     <div class="row form-horizontal">
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner!=null}">
@@ -182,13 +183,13 @@
                 </p:fragment>
                 <div class="button-block">
                     <p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
-                    <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeCancel" value="#{bundle.cancel}"/>
+                    <p:commandButton id="themeCancel" class="btn btn-link" value="#{bundle.cancel}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
                 </div>
             </p:tab>
             <p:tab id="themeTabDisabled" title="#{bundle['dataverse.theme.title']}" rendered="#{themeWidgetFragment.editDv.owner == null and settingsWrapper.rootDataverseThemeDisabled}">
                 <div>#{bundle['dataverse.theme.disabled']}</div>
                 <div class="button-block">
-                    <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeTabDisabledDone" value="#{bundle.done}"/>
+                    <p:commandButton id="themeTabDisabledDone" class="btn btn-default" value="#{bundle.done}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
                 </div>
             </p:tab>
             <p:tab id="widgetsTab" title="#{bundle['dataverse.widgets.title']}">
@@ -245,7 +246,7 @@
                         <textarea rows="3" cols="54" class="form-control">&lt;script src=&quot;#{systemConfig.dataverseSiteUrl}/resources/js/widgets.js?alias=#{themeWidgetFragment.editDv.alias}&amp;amp;dvUrl=#{systemConfig.dataverseSiteUrl}&amp;amp;widgetScope=#{themeWidgetFragment.editDv.alias}&amp;amp;widget=iframe&amp;amp;heightPx=500&quot;&gt;&lt;/script&gt;</textarea>
                     </div>
                     <div class="button-block">
-                        <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="widgetsDone" value="#{bundle.done}"/>
+                        <p:commandButton id="widgetsDone" class="btn btn-default" value="#{bundle.done}" action="#{themeWidgetFragment.cancel()}" immediate="true"/>
                     </div>
                 </ui:fragment>
             </p:tab>

From 62642ef06e9f1fedea03cb677749b3bfee022ef3 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 5 Jun 2019 15:19:51 -0400
Subject: [PATCH 05/10] Style Guide: primary button is styled differently #5717

---
 doc/sphinx-guides/source/style/patterns.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/sphinx-guides/source/style/patterns.rst b/doc/sphinx-guides/source/style/patterns.rst
index 781de3d40fb..377fb4e3495 100644
--- a/doc/sphinx-guides/source/style/patterns.rst
+++ b/doc/sphinx-guides/source/style/patterns.rst
@@ -378,7 +378,7 @@ For action buttons on a page, we include an icon and text label. Action buttons
 Form Buttons
 ------------
 
-Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels.
+Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels. The primary button is styled differently.
 
 .. raw:: html
 
@@ -388,7 +388,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They
 	  		<button id="datasetForm:save" name="datasetForm:save" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
 	  			<span class="ui-button-text ui-c">Save Changes</span>
 	  		</button>
-	  		<button id="datasetForm:cancel" name="datasetForm:cancel" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
+	  		<button id="datasetForm:cancel" name="datasetForm:cancel" class="btn btn-link" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
 	  			<span class="ui-button-text ui-c">Cancel</span>
 	  		</button>
   		</div>
@@ -399,7 +399,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They
 
     <div class="button-block">
       <p:commandButton id="save" styleClass="btn btn-default" value="#{bundle.saveChanges}" action="#{page.save}" update="@form,:messagePanel" />
-      <p:commandButton id="cancel" styleClass="btn btn-default" value="#{bundle.cancel}" action="#{page.cancel}" process="@this" update="@form">
+      <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{page.cancel}" process="@this" update="@form">
         <p:resetInput target="@form" />
       </p:commandButton>
     </div>

From 2c28994894b93fa4880b54a197fae98cd3a92e80 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 7 Jun 2019 17:00:58 -0400
Subject: [PATCH 06/10] Another round of accessibility refactoring [ref #5717]

---
 src/main/java/propertyFiles/Bundle.properties |  13 +-
 src/main/webapp/dashboard-users.xhtml         |   5 +-
 src/main/webapp/dataset-license-terms.xhtml   | 562 +++++++++---------
 src/main/webapp/dataset-versions.xhtml        |   6 +-
 src/main/webapp/dataset-widgets.xhtml         |   4 +-
 src/main/webapp/dataset.xhtml                 |  70 +--
 .../webapp/datasetFieldForEditFragment.xhtml  |  11 +-
 src/main/webapp/dataverse.xhtml               |   4 +-
 src/main/webapp/editFilesFragment.xhtml       |   7 +-
 src/main/webapp/editdatafiles.xhtml           |   8 +-
 .../webapp/file-download-popup-fragment.xhtml |   2 +-
 src/main/webapp/harvestclients.xhtml          |   8 +-
 src/main/webapp/manage-groups.xhtml           |   4 +-
 src/main/webapp/manage-guestbooks.xhtml       |   4 +-
 src/main/webapp/manage-templates.xhtml        |  10 +-
 src/main/webapp/metadataFragment.xhtml        |  19 +-
 src/main/webapp/permissions-configure.xhtml   |   1 -
 .../webapp/permissions-manage-files.xhtml     |   5 +-
 src/main/webapp/permissions-manage.xhtml      |   1 +
 src/main/webapp/roles-assign.xhtml            |   2 +-
 src/main/webapp/roles-edit.xhtml              |   2 +-
 src/main/webapp/search/advanced.xhtml         |   4 +-
 src/main/webapp/template.xhtml                |   4 +-
 23 files changed, 355 insertions(+), 401 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 31266f70f06..ee59bc991f2 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1227,8 +1227,7 @@ dataset.submit.failure.isReleased=Latest version of dataset is already released.
 dataset.submit.failure.inReview=You cannot submit this dataset for review because it is already in review.
 dataset.rejectMessage=Return this dataset to contributor for modification.
 dataset.rejectWatermark=Please enter a reason for returning this dataset to its author(s).
-dataset.reject.enterReason=Reason for return to author is required
-dataset.reject.enterReason.header=Required entry
+dataset.reject.enterReason.error=Reason for return to author is required.
 dataset.reject.success=This dataset has been sent back to the contributor.
 dataset.reject.failure=Dataset Submission Return Failed - {0}
 dataset.reject.datasetNull=Cannot return the dataset to the author(s) because it is null.
@@ -1643,20 +1642,10 @@ file.deaccessionDialog.leaveURL.watermark=Optional dataset site, http://...
 file.deaccessionDialog.deaccession.tip=Are you sure you want to deaccession? The selected version(s) will no longer be viewable by the public.
 file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? It will no longer be viewable by the public.
 file.deaccessionDialog.dialog.selectVersion.error=Please select version(s) for deaccessioning.
-file.deaccessionDialog.dialog.selectVersion.tip=Please select version(s) for deaccessioning.
-file.deaccessionDialog.dialog.selectVersion.header=Please Select Version(s)
-file.deaccessionDialog.dialog.reason.tip=Please select reason for deaccessioning.
 file.deaccessionDialog.dialog.reason.error=Please select reason for deaccessioning.
-file.deaccessionDialog.dialog.reason.header=Please Select Reason
-file.deaccessionDialog.dialog.url.tip=Please enter valid forwarding URL.
 file.deaccessionDialog.dialog.url.error=Please enter valid forwarding URL.
-file.deaccessionDialog.dialog.url.header=Invalid URL
-file.deaccessionDialog.dialog.textForReason.tip=Please enter text for reason for deaccessioning.
-file.deaccessionDialog.dialog.textForReason.header=Enter additional information
 file.deaccessionDialog.dialog.textForReason.error=Please enter text for reason for deaccessioning.
-file.deaccessionDialog.dialog.limitChar.tip=Text for reason for deaccessioning may be no longer than 1000 characters.
 file.deaccessionDialog.dialog.limitChar.error=Text for reason for deaccessioning may be no longer than {0} characters.
-file.deaccessionDialog.dialog.limitChar.header=Limit 1000 characters
 file.viewDiffDialog.header=Version Differences Details
 file.viewDiffDialog.dialog.warning=Please select two versions to view the differences.
 file.viewDiffDialog.notAvailable=N/A
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index 764ecb3252c..7a824435bf7 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -4,7 +4,6 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
-      xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
     <h:head>
@@ -101,8 +100,8 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <p:commandButton tabindex="1" styleClass="btn btn-default" value="#{bundle.yes}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
-                            <p:commandButton tabindex="1" styleClass="btn btn-link" value="#{bundle.no}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}" update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.yes}" action="#{DashboardUsersPage.saveSuperuserStatus()}" update="userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
+                            <p:commandButton styleClass="btn btn-link" value="#{bundle.no}" action="#{DashboardUsersPage.cancelSuperuserStatusChange()}" update=":dashboardUsersForm:userTable,:messagePanel" onclick="PF('toggleSuperuserConfirmation').hide();"/>
                         </div>
                     </p:dialog>
                     <p:dialog id="removeRolesConfirm" header="#{bundle['dashboard.list_users.tbl_header.roles.removeAll.header']}" widgetVar="removeRolesConfirm" modal="true" closable="false">
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index f76bf27cad9..8b83998af30 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -69,159 +69,152 @@
                            </div>
                        </div>
 
-                       <!-- Additional Information
-                       <ui:fragment rendered="# {!empty editMode or empty editMode and (!empty termsOfUseAndAccess.confidentialityDeclaration 
-                                            or !empty termsOfUseAndAccess.specialPermissions or !empty termsOfUseAndAccess.restrictions or !empty termsOfUseAndAccess.citationRequirements 
-                                            or !empty termsOfUseAndAccess.depositorRequirements
-                                            or !empty termsOfUseAndAccess.conditions or !empty termsOfUseAndAccess.disclaimer)}"> -->
-                       
-                           <ui:fragment rendered="#{empty editMode}">
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
-                                   <label for="confidentialityDeclaration" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
-                                   <label for="specialPermissions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
-                                   <label for="restrictions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
-                                   <label for="citationRequirements" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
-                                   <label for="depositorRequirements" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
-                                   <label for="conditions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
-                                   <label for="disclaimer" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
-                                   </div>
-                               </div>
-                           </ui:fragment>
-                           <ui:fragment rendered="#{!empty editMode}">
-                               <div class="form-group">
-                                   <label for="confidentialityDeclaration" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="confidentialityDeclaration" value="#{termsOfUseAndAccess.confidentialityDeclaration}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="specialPermissions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="specialPermissions" value="#{termsOfUseAndAccess.specialPermissions}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="restrictions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="restrictions" value="#{termsOfUseAndAccess.restrictions}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="citationRequirements" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="citationRequirements" value="#{termsOfUseAndAccess.citationRequirements}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="depositorRequirements" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="depositorRequirements" value="#{termsOfUseAndAccess.depositorRequirements}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="conditions" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="conditions" value="#{termsOfUseAndAccess.conditions}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="disclaimer" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea id="disclaimer" value="#{termsOfUseAndAccess.disclaimer}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                           </ui:fragment>
-                       
-                       <!-- </ui:fragment>
-                       END: Additional Information -->
+                       <!-- Additional Information -->
+                        <ui:fragment rendered="#{empty editMode}">
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
+                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
+                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
+                                <label for="restrictions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
+                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
+                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
+                                <label for="conditions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
+                                </div>
+                            </div>
+                            <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
+                                <label for="disclaimer" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
+                                </div>
+                            </div>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{!empty editMode}">
+                            <div class="form-group">
+                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="confidentialityDeclaration" value="#{termsOfUseAndAccess.confidentialityDeclaration}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="specialPermissions" value="#{termsOfUseAndAccess.specialPermissions}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="restrictions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="restrictions" value="#{termsOfUseAndAccess.restrictions}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="citationRequirements" value="#{termsOfUseAndAccess.citationRequirements}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="depositorRequirements" value="#{termsOfUseAndAccess.depositorRequirements}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="conditions" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="conditions" value="#{termsOfUseAndAccess.conditions}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="disclaimer" class="col-sm-3 control-label">
+                                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
+                                </label>
+                                <div class="col-sm-9">
+                                    <p:inputTextarea id="disclaimer" value="#{termsOfUseAndAccess.disclaimer}" rows="5" cols="60" styleClass="form-control" />
+                                </div>
+                            </div>
+                        </ui:fragment>
+                       <!-- END: Additional Information -->
                    </div>
                </p:fragment>
            </div>
@@ -231,7 +224,7 @@
                                                         or !empty termsOfUseAndAccess.dataAccessPlace 
                                         or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus 
                                         or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection 
-                                        or !empty termsOfUseAndAccess.studyCompletion)}" >
+                                        or !empty termsOfUseAndAccess.studyCompletion)}">
            <div data-toggle="collapse" data-target="#panelCollapseTOA" class="panel-heading text-info">
                <h:outputText value="#{settingsWrapper.publicInstall ? bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess'] : bundle['file.dataFilesTab.terms.list.termsOfAccess.header']}"/>
                &#160;<span class="glyphicon glyphicon-chevron-up"/>
@@ -304,140 +297,132 @@
                        </div>
                    </ui:fragment>
 
-                   <!-- Additional Information
-                   <ui:fragment rendered="# {!empty editMode or empty editMode and (!empty termsOfUseAndAccess.dataAccessPlace 
-                                        or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus 
-                                        or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection 
-                                        or !empty termsOfUseAndAccess.studyCompletion)}"> -->
-                       
-                       
-                           <ui:fragment rendered="#{empty editMode}">
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
-                                   </div>
-                               </div>
-                               <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
-                                   </div>
-                               </div>
-                           </ui:fragment>
-                           <ui:fragment rendered="#{!empty editMode}">
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                               <div class="form-group">
-                                   <label for="metadata_TermsUse" class="col-sm-3 control-label">
-                                       #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
-                                       <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                             data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
-                                   </label>
-                                   <div class="col-sm-9">
-                                       <p:inputTextarea value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
-                                   </div>
-                               </div>
-                           </ui:fragment>
-                       
-                   <!-- </ui:fragment>
-                   END: Additional Information -->
+                   <!-- Additional Information -->
+                    <ui:fragment rendered="#{empty editMode}">
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
+                            </div>
+                        </div>
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
+                            </div>
+                        </div>
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
+                            </div>
+                        </div>
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
+                            </div>
+                        </div>
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
+                            </div>
+                        </div>
+                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
+                            </div>
+                        </div>
+                    </ui:fragment>
+                    <ui:fragment rendered="#{!empty editMode}">
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
+                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p:inputTextarea value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
+                            </div>
+                        </div>
+                    </ui:fragment>
+                   <!-- END: Additional Information -->
                </div>
            </div>
        </div>
@@ -485,7 +470,6 @@
                                    </div>
                                </ui:fragment>
                            </ui:fragment>
-
                            <ui:fragment rendered="#{!empty editMode and datasetPage}">
                                <p class="help-block">#{bundle['file.dataFilesTab.terms.list.guestbook.select.tip']}</p>
 
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index 308a59e35ed..0d716b0d2a9 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -34,10 +34,10 @@
            update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}"
            actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
     <div class="text-right margin-bottom">
-        <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
-                         rendered="#{DatasetPage.compareVersionsCount > 2}">
+        <button type="button" class="btn btn-default" onclick="testCheckBoxes();"
+                         jsf:rendered="#{DatasetPage.compareVersionsCount > 2}">
             <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
-        </p:commandLink>
+        </button>
         <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
                          style="display:none"
                          update=":datasetForm"
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index f706710d012..86173db019b 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -43,7 +43,7 @@
                                             <h:graphicImage value="#{DatasetWidgetsPage.datasetThumbnail.base64image}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null}"/>
                                         </p>
                                         <span class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></span>
-                                        <p:commandButton update="@all" value="#{bundle.remove}" action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null and DatasetWidgetsPage.datasetThumbnail.fromDataFile != true}" oncomplete="bind_bsui_components();"/>
+                                        <p:commandButton update="@form" value="#{bundle.remove}" action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}" rendered="#{DatasetWidgetsPage.datasetThumbnail != null and DatasetWidgetsPage.datasetThumbnail.fromDataFile != true}" oncomplete="bind_bsui_components();"/>
                                         <div jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail.fromDataFile == true}">
                                             <button class="btn btn-default" onclick="PF('confrmRemove').show()" type="button">
                                                 #{bundle.remove}
@@ -69,7 +69,7 @@
                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
                                             </label>
-                                            <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@all" 
+                                            <p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@form" 
                                                           sizeLimit="#{systemConfig.uploadLogoSizeLimit}" 
                                                           oncomplete="bind_bsui_components();" dragDropSupport="true" auto="true" multiple="false" 
                                                           fileUploadListener="#{DatasetWidgetsPage.handleImageFileUpload}" label="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload']}"/>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 5a8a33001cb..22f1b34d2c2 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -175,24 +175,24 @@
                                     <!-- END: Publish Buttons -->
 
                                     <!-- Return to Author Button -->
-                                    <p:commandLink styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview)                                                                                                           
-                                                                                                          ? 'disabled' : ''}" onclick="PF('sendBackToContributor').show()"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
+                                    <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
+                                                          onclick="PF('sendBackToContributor').show()"
+                                                          jsf:rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                                   <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                    </p:commandLink>
+                                        <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
+                                    </button>
                                     <!-- END: Return to Author Button -->
 
                                     <!-- Submit for Review Button -->
-                                    <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                                and !DatasetPage.datasetLockedInWorkflow
-                                                                and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                                and DatasetPage.canUpdateDataset()
-                                                                and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" onclick="PF('inreview').show()">
-                                            <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
-                                        </button>
-                                    </ui:fragment>
+                                    <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                          onclick="PF('inreview').show()"
+                                                          jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                                            and !DatasetPage.datasetLockedInWorkflow
+                                                            and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                            and DatasetPage.canUpdateDataset()
+                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                        <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                    </button>
                                         
                                     <!-- End: Submit for Review Button -->
                                 </ui:fragment>
@@ -450,7 +450,7 @@
 
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
-                        <!--<p:focus context="datasetForm"/>-->
+                        <p:focus context="datasetForm"/>
                         <div class="form-group">
                             <label for="select_HostDataverse" class="col-sm-2 control-label">
                                 #{bundle.hostDataverse}
@@ -663,11 +663,11 @@
 
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
-                        <p:commandButton id="save" styleClass="btn btn-default" tabindex="1000" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
-                        <p:commandButton id="cancel" styleClass="btn btn-link" tabindex="1000" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
+                        <p:commandButton id="save" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
+                        <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
-                        <p:button id="cancelCreate" styleClass="btn btn-link" tabindex="1000" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>
+                        <p:button id="cancelCreate" styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DatasetPage.dataset.owner.alias}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>
                         <p:commandButton value="Direct" id="datasetSave"
                                          style="display:none"
                                          update=":datasetForm,:messagePanel"
@@ -806,7 +806,6 @@
                             <p:focus for="selectVersionChk"/>
                             <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deaccessionDialog.tip']}</p>
                             <div class="form-group" jsf:rendered="#{DatasetPage.releasedVersionTabList.size() > 1}">
-
                                 <label for="selectVersionChk">#{bundle['file.deaccessionDialog.reason.question1']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>                           
                                 <p:selectManyCheckbox id="selectVersionChk" value="#{DatasetPage.selectedDeaccessionVersions}" converter="datasetVersionConverter"
                                                       layout="pageDirection" required="#{param['DO_DEACCESSION_VALIDATION']}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.selectVersion.error']}" widgetVar="selectVersionChk">
@@ -816,16 +815,16 @@
                             </div>
                             <div class="form-group">
                                 <label for="reasonOptions">#{bundle['file.deaccessionDialog.reason.question2']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
-                                <p:selectOneMenu  widgetVar="reasonOptions" id="reasonOptions" styleClass="form-control" value="#{DatasetPage.deaccessionReasonRadio}" required="#{param['DO_DEACCESSION_VALIDATION']}" 
+                                <p:selectOneMenu widgetVar="reasonOptions" id="reasonOptions" styleClass="form-control" value="#{DatasetPage.deaccessionReasonRadio}" required="#{param['DO_DEACCESSION_VALIDATION']}" 
                                                   binding="#{reasonRadio}" requiredMessage="#{bundle['file.deaccessionDialog.dialog.reason.error']}">
-                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="0" noSelectionOption="true" />
+                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="#{null}" noSelectionOption="true" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.identifiable']}" itemValue="1" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beRetracted']}" itemValue="2" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.beTransferred']}" itemValue="3" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.IRB']}" itemValue="4" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.legalIssue']}" itemValue="5" />
                                     <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.notValid']}" itemValue="6" />
-                                    <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.other']}" itemValue="7" />                               
+                                    <f:selectItem itemLabel="#{bundle['file.deaccessionDialog.reason.selectItem.other']}" itemValue="7" />
                                 </p:selectOneMenu>
                                 <p:message for="reasonOptions"/>
                             </div>
@@ -878,11 +877,6 @@
                             </button>
                         </div>
                     </p:dialog>
-                    <p:confirmDialog id="selectDeaccessionVersion" message="#{bundle['file.deaccessionDialog.dialog.selectVersion.tip']}" header="#{bundle['file.deaccessionDialog.dialog.selectVersion.header']}" widgetVar="selectDeaccessionVersion"> </p:confirmDialog>
-                    <p:confirmDialog id="selectDeaccessionReason" message="#{bundle['file.deaccessionDialog.dialog.reason.tip']}" header="#{bundle['file.deaccessionDialog.dialog.reason.header']}" widgetVar="selectDeaccessionReason"> </p:confirmDialog>
-                    <p:confirmDialog id="enterForwardUrl" message="#{bundle['file.deaccessionDialog.dialog.url.tip']}" header="#{bundle['file.deaccessionDialog.dialog.url.header']}" widgetVar="enterForwardUrl"> </p:confirmDialog>
-                    <p:confirmDialog id="enterOtherReason" message="#{bundle['file.deaccessionDialog.dialog.textForReason.tip']}" header="#{bundle['file.deaccessionDialog.dialog.textForReason.header']}" widgetVar="enterOtherReason"> </p:confirmDialog>
-                    <p:confirmDialog id="reasonTooManyCharacters" message="#{bundle['file.deaccessionDialog.dialog.limitChar.tip']}" header="#{bundle['file.deaccessionDialog.dialog.limitChar.header']}" widgetVar="reasonTooManyCharacters"> </p:confirmDialog>
                     <p:inputText id="hiddenReasonInput" style="display:none" widgetVar="hiddenReasonInput"/>
                     <p:dialog id="compareTwo" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="compareTwo" modal="true">
                         <p class="help-block"><span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
@@ -1528,7 +1522,10 @@
                         <ui:remove>
                         <!--FIXME update for new comments table -->
                         <p:inputTextarea id="returnReason" rows="3" value="#{DatasetPage.workingVersion.returnReason}" maxlength="200" widgetVar="returnReason"
-                                         cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"/>
+                                         cols="70" counter="display" counterTemplate="{0} characters remaining." autoResize="false"
+                                         requiredMessage="#{bundle['dataset.reject.enterReason.error']}"/>
+                        <!--FIXME validation error msg for returnReason was in confirmDialog using testReturnReason() in commandButton below but all that was removed
+                                  as it did not look like the usual validation method, added preferred requiredMessage attribute to inputTextarea above, need wiring #5717-->
                         <p>
                             <h:outputText id="display"/>
                         </p>
@@ -1537,16 +1534,12 @@
 
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}"/>
-                            <ui:remove>
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="testReturnReason();"/>
-                            </ui:remove>
                             <button class="btn btn-link" onclick="PF('sendBackToContributor').hide();PF('blockDatasetForm').hide();" type="button">                              
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
-                    <p:remoteCommand name="returnToAuthorCommand" action="#{DatasetPage.sendBackToContributor}"/>
-                    <p:confirmDialog id="enterReturnReason" message="#{bundle['dataset.reject.enterReason']}" header="#{bundle['dataset.reject.enterReason.header']}" widgetVar="enterReturnReason"></p:confirmDialog>                   
+                    <p:remoteCommand name="returnToAuthorCommand" action="#{DatasetPage.sendBackToContributor}"/>                  
                     <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
                 <script type="text/javascript">
@@ -1554,15 +1547,6 @@
                         popoverHTML('#{bundle.htmlAllowedTitle}');
                     });
                     
-                    function testReturnReason(){
-                        var returnReasonText = PF('returnReason').jq.val();
-                        if (returnReasonText.length===0){
-                            PF('enterReturnReason').show();
-                        } else {
-                            PF('sendBackToContributor').hide();
-                            returnToAuthorCommand();
-                        }                           
-                    }
                     function openDialog() {
                         PF('details').show();
                     }
@@ -1640,4 +1624,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index 15f89722819..baeee6318df 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -9,7 +9,7 @@
     <!-- input text start -->
     <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/>
 
-    <p:inputText value="#{dsfv.valueForEdit}" id="inputText" tabindex="#{block.index+1}"
+    <p:inputText value="#{dsfv.valueForEdit}" id="inputText"
                  styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
                  rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
                              and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
@@ -17,14 +17,13 @@
                              or dsfv.datasetField.datasetFieldType.fieldType == 'FLOAT'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
-                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL'
-                             )}"/>
+                             or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"/>
 
     <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
 
-    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" tabindex="#{block.index+1}"
+    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description"
                      rows="5" cols="60" styleClass="form-control"
-                     rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}" />
+                     rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
 
     <p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
 
@@ -38,7 +37,7 @@
 
     <!-- This button / script is for replication data for the title field and is client side only -->
     <ui:fragment rendered="#{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' }">
-        <input type="button" id="replicationDataButton" tabindex="#{block.index+1}"
+        <input type="button" id="replicationDataButton"
                class="btn btn-default" value="#{bundle['dataset.AddReplication']}"
                onclick="replicationFor();return false;"/>
 
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 140f63004a9..cc9173adf4b 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -599,8 +599,8 @@
                                 <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.nopublished.tip']}
                             </p>
                             <div class="button-block">
-                                <button class="btn btn-link" onclick="PF('browseOptsForm').hide();" type="button">                              
-                                    #{bundle.cancel}
+                                <button class="btn btn-default" onclick="PF('browseOptsForm').hide();" type="button">                              
+                                    #{bundle.close}
                                 </button>
                             </div>
                         </ui:fragment>
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 2c76ba885f5..62d3600af23 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -549,6 +549,7 @@
         </div>
     </p:dialog>
     <p:dialog id="editFileAccessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="editFileAccessPopup" modal="true">
+        <p:focus context="editFileAccessPopup"/>
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="metadata_TermsAccess" class="col-sm-3 control-label">
@@ -581,7 +582,7 @@
         </div>
     </p:dialog>
     <p:dialog id="fileAdvancedOptions" styleClass="dialog-submenu smallPopUp" header="#{bundle['file.advancedIngestOptions']}" widgetVar="fileAdvancedOptions" modal="true">
-        <p:focus for="spssSavEncodingLanguage"/>
+        <p:focus context="fileAdvancedOptions"/>
         <div class="form-horizontal">
             <!-- select text encoding, for SPSS-SAV (and, and possibly, other) (this option is only available during ingest) data files; not implemented yet -->
             <div class="form-group" jsf:rendered="#{!(empty EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup) and (empty EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup.id) and dataFileServiceBean.isSpssSavFile(EditDatafilesPage.fileMetadataSelectedForIngestOptionsPopup.dataFile)}">
@@ -764,7 +765,7 @@
     </p:dialog>
     <!-- end of "advanced options" dialogue -->
     <p:dialog id="fileSetThumbnail" styleClass="smallPopUp" header="#{bundle['file.setThumbnail.header']}" widgetVar="fileSetThumbnail" modal="true">
-        <p:focus for="datasetThumbnailImage"/>
+        <p:focus context="fileSetThumbnail"/>
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="datasetThumbnailImage" class="col-sm-4 control-label">
@@ -798,7 +799,7 @@
     </p:dialog>
     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml"/>
     <p:dialog id="editFileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="editFileTagsPopup" modal="true">
-        <p:focus for="fileTagsMenu"/>
+        <p:focus context="editFileTagsPopup"/>
         <p class="help-block">#{bundle['file.editTagsDialog.tip']}</p>
         <div class="form-horizontal" jsf:rendered="#{!(empty EditDatafilesPage.fileMetadataSelectedForTagsPopup)}">
             <div class="form-group text-left">
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 9b53450ab4a..3e06e9144b1 100644
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -70,11 +70,13 @@
                         <div class="button-block">
                             <p:outputPanel id="filesButtons">
                                 <div jsf:rendered="#{!(empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment()))}">
-                                    <p:commandButton styleClass="btn btn-default" tabindex="1000" id="savebutton" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();"/> 
-                                    <p:commandButton styleClass="btn btn-link" tabindex="1000" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();"/>
+                                    <button id="savebutton" class="btn btn-default" onclick="checkNewlyRestricted();" type='button'>
+                                        #{bundle.saveChanges}
+                                    </button>
+                                    <p:commandButton styleClass="btn btn-link" id="cancelbutton" value="#{bundle.cancel}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
                                 </div>
                                 <div jsf:rendered="#{empty EditDatafilesPage.fileMetadatas and (datasetPage || EditDatafilesPage.showFileUploadFragment())}">
-                                    <p:commandButton styleClass="btn btn-default" tabindex="1000" id="doneFilesButtonnop" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();"/>
+                                    <p:commandButton styleClass="btn btn-default" id="doneFilesButtonnop" value="#{bundle.done}" action="#{EditDatafilesPage.cancel}" process="@this" update="@form" oncomplete="bind_bsui_components();"/>
                                 </div>
                                 <p:commandButton value="Direct" id="datasetSave"
                                                  style="display:none"
diff --git a/src/main/webapp/file-download-popup-fragment.xhtml b/src/main/webapp/file-download-popup-fragment.xhtml
index 249d9df5450..7f9c2c51d78 100644
--- a/src/main/webapp/file-download-popup-fragment.xhtml
+++ b/src/main/webapp/file-download-popup-fragment.xhtml
@@ -10,7 +10,7 @@
 
 
         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-        <p:focus for="guestbookuser_nameText"/>
+        <p:focus context="downloadPopup"/>
         <p class="help-block">
             #{bundle['file.downloadDialog.tip']}
         </p>
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 2f2fcd533d0..f95e46531c2 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -449,23 +449,21 @@
 
                                 <div class="form-group">
                                     <div class="col-sm-6 col-sm-offset-3 button-block">
-                                        <p:commandLink type="button"
-                                                        id="createStepThreePrevious"
+                                        <p:commandLink id="createStepThreePrevious"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
                                                         action="#{harvestingClientsPage.backToStepTwo()}">
                                             <span class="glyphicon glyphicon-menu-left"/> #{bundle.previous}
                                         </p:commandLink>
-                                        <p:commandLink type="button"
-                                                        id="createStepThreeNext"
+                                        <p:commandLink id="createStepThreeNext"
                                                         styleClass="btn btn-default"
                                                         update=":harvestingClientsForm:newHarvestingClientDialog"
                                                         oncomplete="PF('newHarvestingClientForm').show();bind_bsui_components();"
                                                         action="#{harvestingClientsPage.goToStepFour()}">
                                             <span class="glyphicon glyphicon-menu-right"/> #{bundle.next}
                                         </p:commandLink>
-                                        <button type="button" class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" value="#{bundle.cancel}">
+                                        <button class="btn btn-link" onclick="PF('newHarvestingClientForm').hide()" type="button">
                                             #{bundle.cancel}
                                         </button>
                                     </div>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index f38a49b2b2a..ae229e0caee 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -77,7 +77,7 @@
                                         </p:commandLink>
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGroupsPage.setSelectedGroup(explicitGroup)}"
-                                                       update="@form"
+                                                       update="@all"
                                                        oncomplete="PF('deleteConfirmation').show()"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.delete']}">
                                             <span class="glyphicon glyphicon-trash"></span>
@@ -97,7 +97,7 @@
                         </div>
                     </p:dialog>
                     <p:dialog id="viewGroup" styleClass="largePopUp" header="#{bundle['dataverse.manageGroups.tab.action.btn.view.dialog.header']}" widgetVar="viewGroup" modal="true">
-                        <p:focus for="addRoleAssigneeName"/>
+                        <p:focus context="viewGroup"/>
                         <div class="form-horizontal">
                             <div class="form-group">
                                 <label for="select_GroupName" class="col-sm-3 control-label">
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index ba4f062a465..97cbe97ccb6 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -103,13 +103,13 @@
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and !guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.enableGuestbook(guestbook)}"
                                                    update="@form,:messagePanel"
-                                                   oncomplete="bind_tooltip_popover();"/>
+                                                   oncomplete="bind_bsui_components();"/>
                                     <p:commandLink styleClass="btn btn-default"
                                                    value="#{bundle['dataset.manageGuestbooks.tab.action.btn.disable']}"
                                                    rendered="#{manageGuestbooksPage.dataverse.id eq guestbook.dataverse.id and guestbook.enabled}"
                                                    action="#{manageGuestbooksPage.disableGuestbook(guestbook)}"
                                                    update="@form,:messagePanel"
-                                                   oncomplete="bind_tooltip_popover();"/>
+                                                   oncomplete="bind_bsui_components();"/>
                                     <div class="btn-group" role="group">
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                        action="#{manageGuestbooksPage.viewSelectedGuestbook(guestbook)}"
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 8bffc68a3c1..781634a8238 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -88,20 +88,20 @@
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate != template}"
                                                actionListener="#{manageTemplatesPage.makeDefault(template)}"
                                                update="@form,:messagePanel"
-                                               oncomplete="bind_tooltip_popover();bind_bsui_components();"/>
+                                               oncomplete="bind_bsui_components();"/>
                                 <p:commandLink styleClass="btn btn-default"
                                                value="#{bundle['dataset.manageTemplates.tab.action.btn.default']}"
                                                rendered="#{manageTemplatesPage.dataverse.defaultTemplate == template}"
                                                actionListener="#{manageTemplatesPage.unselectDefault(template)}"
                                                update="@form,:messagePanel"
-                                               oncomplete="bind_tooltip_popover();bind_bsui_components();">
+                                               oncomplete="bind_bsui_components();">
                                     <span class="glyphicon glyphicon-eye-open"></span>
                                 </p:commandLink>
                                 <div class="btn-group" role="group">
                                     <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.view']}"
                                                    action="#{manageTemplatesPage.viewSelectedTemplate(template)}"
-                                                   oncomplete="PF('viewTemplate').show();bind_tooltip_popover();bind_bsui_components();"
+                                                   oncomplete="PF('viewTemplate').show();bind_bsui_components();"
                                                    update=":manageTemplatesForm">
                                         <span class="glyphicon glyphicon-eye-open"></span>
                                     </p:commandLink>
@@ -109,7 +109,7 @@
                                                    title="#{bundle['dataset.manageTemplates.tab.action.btn.copy']}"
                                                    action="#{manageTemplatesPage.cloneTemplate(template)}"
                                                    update="@form"
-                                                   oncomplete="bind_tooltip_popover();bind_bsui_components();">
+                                                   oncomplete="bind_bsui_components();">
                                         <span class="glyphicon glyphicon-duplicate"></span>
                                     </p:commandLink>
                                     <div class="btn-group" jsf:rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}">
@@ -134,7 +134,7 @@
                                                    update="@form,:messagePanel"
                                                    action="#{manageTemplatesPage.setSelectedTemplate(template)}"
                                                    rendered="#{manageTemplatesPage.dataverse.id eq template.dataverse.id}"
-                                                   oncomplete="PF('deleteConfirmation').show();bind_tooltip_popover();bind_bsui_components();">
+                                                   oncomplete="PF('deleteConfirmation').show();bind_bsui_components();">
                                         <span class="glyphicon glyphicon-trash"></span>
                                     </p:commandLink>
                                 </div>
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 8656ac33ced..a15ade0b0df 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -124,7 +124,7 @@
                                                     we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
                                                 <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
                                                     <div class="form-col-container col-sm-12">
-                                                        <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount" >
+                                                        <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
                                                             <div class="form-group dataset-field-values">
                                                                 <div class="form-col-container col-sm-9 edit-field">
                                                                     <ui:include src="datasetFieldForEditFragment.xhtml">
@@ -134,14 +134,14 @@
                                                                 </div>
                                                                 <!-- Add / Remove buttons -->
                                                                 <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:commandLink tabindex="#{block.index+1}" title="#{bundle.add}"
+                                                                    <p:commandLink title="#{bundle.add}"
                                                                                    styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                                    actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
                                                                                    update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
                                                                                    oncomplete="javascript:bind_bsui_components();">
                                                                         <span class="glyphicon glyphicon-plus no-text"/>
                                                                     </p:commandLink>
-                                                                    <p:commandLink tabindex="#{block.index+1}" title="#{bundle.delete}"
+                                                                    <p:commandLink title="#{bundle.delete}"
                                                                                    styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                                    rendered="#{dsf.datasetFieldValues.size() > 1}"
                                                                                    actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
@@ -153,17 +153,16 @@
                                                             </div>
                                                         </ui:repeat>
                                                         <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
-                                                            <p:selectOneMenu tabindex="#{block.index+1}"
-                                                                             value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive SELECT TESTTEST"
+                                                            <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
                                                                              rendered="#{!dsf.datasetFieldType.allowMultiples}">
                                                                 <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                             </p:selectOneMenu>
                                                             <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
                                                                 <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
                                                                                       layout="pageDirection">
                                                                     <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
+                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                                 </p:selectManyCheckbox>
                                                             </div>
                                                             <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
@@ -204,7 +203,7 @@
                                                                 </ui:fragment>
                                                                 <!-- MOVED SELECT ONE TO dataFieldForEdit -->
                                                                 <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:selectOneMenu tabindex="#{block.index+1}" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
+                                                                    <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
                                                                                      rendered="#{!subdsf.datasetFieldType.allowMultiples}">
                                                                         <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
@@ -223,14 +222,14 @@
                                                         </ui:repeat>
                                                     </div>
                                                     <div class="col-sm-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                        <p:commandLink tabindex="#{block.index+1}" title="#{bundle.add}"
+                                                        <p:commandLink title="#{bundle.add}"
                                                                        styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                        actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
                                                                        update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
                                                                        oncomplete="javascript:bind_bsui_components();">
                                                             <span class="glyphicon glyphicon-plus no-text"/>
                                                         </p:commandLink>
-                                                        <p:commandLink tabindex="#{block.index+1}" title="#{bundle.delete}"
+                                                        <p:commandLink title="#{bundle.delete}"
                                                                        styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                        rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
                                                                        actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
diff --git a/src/main/webapp/permissions-configure.xhtml b/src/main/webapp/permissions-configure.xhtml
index 60bba91f60e..3e8f55ba0a6 100644
--- a/src/main/webapp/permissions-configure.xhtml
+++ b/src/main/webapp/permissions-configure.xhtml
@@ -6,7 +6,6 @@
      xmlns:p="http://primefaces.org/ui"
      xmlns:o="http://omnifaces.org/ui">
     
-    <p:focus for="authenticatedUsersContributorRoleRadio"/>
     <div class="form-group">
         <label for="accessRadios">
             #{bundle['dataverse.permissions.Q1']}
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index 066fd290bb8..bb584faf811 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -69,7 +69,7 @@
                                                     <h:outputText value="#{access.key.email}" rendered="#{!empty access.key.email}"/>
                                                 </p:column>
                                                 <p:column width="10%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.usersOrGroups.tabHeader.files']}">
-                                                    <p:commandLink type="button" id="viewUserGroups"
+                                                    <p:commandLink id="viewUserGroups"
                                                                    actionListener="#{manageFilePermissionsPage.initAssignDialogForFileRequester(access.key)}"
                                                                    update=":#{p:resolveClientId('rolesPermissionsForm:assignDialog', view)}"
                                                                    oncomplete="PF('assignWidget').show();">
@@ -180,7 +180,8 @@
                                             <h:outputText value="#{bundle['dataverse.permissionsFiles.files.public']}" rendered="#{fileVersion eq dsLatestVersion and !latestVersionRestricted}"/>
                                         </p:column>
                                         <p:column width="18%" class="text-center" headerText="#{bundle['dataverse.permissionsFiles.files.tabHeader.roleAssignees']}">
-                                            <p:commandLink type="button" id="viewUserGroups" rendered="#{fileEntry.value.size() > 0}"
+                                            <p:commandLink id="viewUserGroups" styleClass="btn btn-default"
+                                                           rendered="#{fileEntry.value.size() > 0}"
                                                            actionListener="#{manageFilePermissionsPage.initViewRemoveDialogByFile(fileEntry.key, fileEntry.value)}"
                                                            update=":#{p:resolveClientId('rolesPermissionsForm:viewRemoveDialog', view)}"
                                                            oncomplete="PF('viewRemoveWidget').show();">
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index 25788bedac5..f75a5471f93 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -202,6 +202,7 @@
                     <!-- Users/Groups Popup -->
                     <!-- Defined this way as we may reuse the include not in a popup -->
                     <p:dialog id="accessDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissions.accessDialog.header']}" widgetVar="accessForm" modal="true">
+                        <p:focus context="accessDialog"/>
                         <ui:include src="permissions-configure.xhtml"/>
                         <div class="button-block">
                             <p:commandButton value="#{bundle['saveChanges']}" styleClass="btn btn-default"
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index 4f9f011ab48..f05009cf13c 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -6,7 +6,7 @@
     xmlns:jsf="http://xmlns.jcp.org/jsf"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
     <p:dialog id="userGroupDialog" styleClass="largePopUp" header="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.header']}" widgetVar="userGroupsForm" modal="true">
-        <p:focus for="userGroupNameAssign"/>
+        <p:focus context="userGroupDialog"/>
         <p:fragment id="assignRoleMessages">
             <div class="container messagePanel">
                 <iqbs:messages collapsible="true" />
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 34c361731c0..a59d53bcdae 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -6,7 +6,7 @@
     <p:dialog id="rolesPermissionsDialog" header="#{bundle['dataverse.permissions.roles.header']}" widgetVar="roleForm" modal="true" styleClass="largePopUp"> 
         <p:panel id="editRolePanel" styleClass="panelLayoutBlock" widgetVar="editRole">
             <p:panel id="editRolePropertiesPanel" styleClass="panelLayoutBlock" widgetVar="roleProperties">
-                <p:focus for="roleName"/>
+                <p:focus context="rolesPermissionsDialog"/>
                 <div class="row form-horizontal">
                     <div class="col-sm-6 form-group">
                         <label class="control-label" for="roleName">
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 6d1f07c9ee3..2b67877fe4a 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -26,7 +26,7 @@
                     <h:form id="advancedSearchForm">
                         <p:focus/>
                         <div class="button-block margin-bottom">
-                            <p:commandButton value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
                         </div>
                         <div class="panel panel-default">
                             <div data-toggle="collapse" data-target="#panelCollapseDataversesFieldList" class="panel-heading">
@@ -210,7 +210,7 @@
                         </div>
 
                         <div class="button-block">
-                            <p:commandButton value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
                         </div>
                     </h:form>
                 </div>
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index b8564406f64..a8a6ae2a685 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -99,7 +99,6 @@
                                 <ui:param name="metadataBlocks" value="#{!empty TemplatePage.editMode ? TemplatePage.template.metadataBlocksForEdit.entrySet().toArray() : TemplatePage.template.metadataBlocksForView.entrySet().toArray()}"/>   
                             </ui:include>  
                         </ui:fragment>
-                        
                         <ui:fragment rendered="#{TemplatePage.editMode == 'LICENSE' or TemplatePage.editMode == 'LICENSEADD'}">
                             <ui:include src="dataset-license-terms.xhtml" >
                                 <ui:param name="datasetPage" value="false"/>
@@ -108,8 +107,7 @@
                                 <ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}"/>   
                             </ui:include> 
                         </ui:fragment>
-
-                        </ui:fragment>
+                    </ui:fragment>
                     <!-- Create/Save Dataset Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty TemplatePage.editMode}">
                         <p:commandButton styleClass="btn btn-default" action="#{TemplatePage.save('Terms')}" update="@all"

From 9bcb432eea31cefed2a4feb926d744f64fd7ba1f Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 10 Jun 2019 10:58:32 -0400
Subject: [PATCH 07/10] Fixed broken onkeypress and onclick javascript on 404
 pg to submit search [ref #5157]

---
 src/main/webapp/404.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml
index 8bedf3e65f9..24384426785 100644
--- a/src/main/webapp/404.xhtml
+++ b/src/main/webapp/404.xhtml
@@ -37,9 +37,9 @@
                         <div class="col-sm-6 col-sm-offset-3">
                             <div class="input-group">
                                 <input jsf:id="search404" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}"
-                                       style="font-size:1em;" onkeypress="if (event.keyCode == 13) {window.location = '/?q=' + document.getElementById('search404').value; return false;}"/>
+                                       style="font-size:1em;" onkeypress="if (event.keyCode == 13) {window.location = '/dataverse/#{dataverseServiceBean.findRootDataverse().alias}/?q=' + this.value; return false;}"/>
                                 <span class="input-group-btn">
-                                    <button id="search404button" class="btn btn-default" onclick="window.location = '/?q=' + document.getElementById('search404').value; return false;" type="button">
+                                    <button id="search404button" class="btn btn-default" onclick="window.location = '/dataverse/#{dataverseServiceBean.findRootDataverse().alias}/?q=' + this.parentNode.previousElementSibling.value; return false;" type="button">
                                         <span class="glyphicon glyphicon-search"/> #{bundle.find}
                                     </button>
                                 </span>

From e43adb66747167a5126363d22637936274007555 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 10 Jun 2019 16:48:07 -0400
Subject: [PATCH 08/10] Fixed btn-default hover state style PrimeFaces and
 Bootstrap theme overwrite issue [ref #5717]

---
 src/main/webapp/resources/css/structure.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 94eb5f7eba3..60fb6f52189 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -882,6 +882,7 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
 .ui-confirm-dialog-severity {margin-top:3px;}
 .ui-widget-content a.btn-default {color:#333;}
 .input-group-btn > .btn, .input-group-btn > .btn-group {border-top-left-radius: 0;border-bottom-left-radius: 0;margin-left: -1px;font-size:14px;}
+.btn-default.ui-state-hover:hover, .btn-default.ui-state-hover {color:#333;background-color:#e6e6e6;border-color:#adadad;background-image:none;}
 .ui-button.btn-link, .ui-button.btn-link.active, .ui-button.btn-link:active, .ui-button.btn-link[disabled], fieldset[disabled] .ui-button.btn-link {padding:0; border:0; border-color:transparent; border-radius:0; background-color:transparent; background-image:none; box-shadow: none; color: #337ab7;}
 .ui-button.btn-link, .ui-button.btn-link:hover, .ui-button.btn-link:focus, .ui-button.btn-link:active {border-color: transparent;}
 .ui-button.btn-link:hover, .ui-button.btn-link:focus {color: #23527c; text-decoration: underline !important; background-color: transparent;}

From fd05813f0636445493dee47263aede635b4585f9 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 10 Jun 2019 16:49:00 -0400
Subject: [PATCH 09/10] Fixed dataset pg validation error msg format issue with
 trailing hyphen [ref #5717]

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 4 +---
 src/main/java/propertyFiles/Bundle.properties           | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 9a61c83bc54..27af3973401 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -3262,9 +3262,7 @@ public String save() {
         // Validate
         Set<ConstraintViolation> constraintViolations = workingVersion.validate();
         if (!constraintViolations.isEmpty()) {
-             //JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("dataset.message.validationError"));
-             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
-            //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details."));
+            FacesContext.getCurrentInstance().validationFailed();
             return "";
         }
         
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index a61e10e4851..7179208a9f6 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1328,7 +1328,6 @@ dataset.message.bulkFileDeleteSuccess=The selected files have been deleted.
 datasetVersion.message.deleteSuccess=This dataset draft has been deleted.
 datasetVersion.message.deaccessionSuccess=The selected version(s) have been deaccessioned.
 dataset.message.deaccessionSuccess=This dataset has been deaccessioned.
-dataset.message.validationError=Validation Error - Required fields were missed or there was a validation error. Please scroll down to see details.
 dataset.message.publishFailure=The dataset could not be published.
 dataset.message.metadataFailure=The metadata could not be updated.
 dataset.message.filesFailure=The files could not be updated.

From 5314fbc5f0c573fa8560156a672641334a299659 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 12 Jun 2019 16:47:19 -0400
Subject: [PATCH 10/10] Fixed flash refresh issue on login pg, reverted
 passwordrest pg changes to msg blocks [ref #5717]

---
 src/main/java/propertyFiles/Bundle.properties | 34 +++++++++----------
 src/main/webapp/loginpage.xhtml               |  4 +--
 src/main/webapp/passwordreset.xhtml           |  3 ++
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 7179208a9f6..8bc15189841 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -259,6 +259,23 @@ passwdVal.passwdValBean.warnDictionaryRead=Dictionary was set, but none was read
 passwdVal.passwdValBean.warnDictionaryObj=PwDictionaries not set and no default password file found:
 passwdVal.passwdValBean.warnSetStrength=The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2}
 
+# passwordreset.xhtml
+pageTitle.passwdReset.pre=Account Password Reset
+passwdReset.token=token :
+passwdReset.userLookedUp=user looked up :
+passwdReset.emailSubmitted=email submitted :
+passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address.
+passwdReset.submitRequest=Submit Password Request
+passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
+passwdReset.debug=DEBUG
+passwdReset.resetUrl=The reset URL is
+passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
+passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
+passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below.
+passwdReset.newPasswd=New Password
+passwdReset.rePasswd=Retype Password
+passwdReset.resetBtn=Reset Password
+
 #loginpage.xhtml
 login.System=Login System
 login.forgot.text=Forgot your password?
@@ -648,23 +665,6 @@ notification.email.info.unavailable=Unavailable
 notification.email.apiTokenGenerated=Hello {0} {1},\n\nAPI Token has been generated. Please keep it secure as you would do with a password.
 notification.email.apiTokenGenerated.subject=API Token was generated
 
-# passwordreset.xhtml
-pageTitle.passwdReset.pre=Account Password Reset
-passwdReset.token=token :
-passwdReset.userLookedUp=user looked up :
-passwdReset.emailSubmitted=email submitted :
-passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address.
-passwdReset.submitRequest=Submit Password Request
-passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
-passwdReset.debug=DEBUG
-passwdReset.resetUrl=The reset URL is
-passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
-passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
-passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below.
-passwdReset.newPasswd=New Password
-passwdReset.rePasswd=Retype Password
-passwdReset.resetBtn=Reset Password
-
 # dataverse.xhtml
 dataverse.title=The project, department, university, professor, or journal this dataverse will contain data for.
 dataverse.enterName=Enter name...
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 254cd452e06..fbe569efc03 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -69,7 +69,7 @@
                                                 <h:inputText rendered="#{not fc.credential.secret}" value="#{fc.value}" id="credValue" styleClass="form-control"/>
                                                 <p:message rendered="#{not fc.credential.secret}" for="credValue" display="text"/>
 						<h:inputSecret rendered="#{fc.credential.secret}" value="#{fc.value}" id="sCredValue" styleClass="form-control" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
-                                                <p:message rendered="#{not fc.credential.secret}" for="sCredValue" display="text"/>
+                                                <p:message rendered="#{fc.credential.secret}" for="sCredValue" display="text"/>
                                             </div>
                                         </div>
                                     </ui:repeat>
@@ -92,7 +92,7 @@
                                     
                                     <div class="form-group">
                                         <div class="col-sm-offset-4 col-sm-9 button-block">
-                                            <p:commandButton id="login" styleClass="btn btn-default" value="#{bundle.login}" update="@all" action="#{LoginPage.login}"/>
+                                            <p:commandButton id="login" styleClass="btn btn-default" value="#{bundle.login}" update="@form,:messagePanel" action="#{LoginPage.login}"/>
                                         </div>
                                     </div>
                                     <div class="form-group">
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 8ddfe9eaf51..2b8a4cac1c1 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -60,6 +60,9 @@
                         </h:form>
                     </div>
                     <ui:fragment rendered="#{not empty PasswordResetPage.emailAddress}">
+                        <h:outputFormat value="#{bundle['passwdReset.successSubmit.tip']}">
+                            <f:param value="#{PasswordResetPage.emailAddress}"/>
+                        </h:outputFormat>
                         <ui:fragment id="debugEmail" rendered="false">
                             <div style="background-color: lightgray">
                                 <tt>