diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 7b641241e7f..1ec44e5566f 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -205,119 +205,131 @@
                                                             </ul>
                                                         </div>
                                                     </div>
+                                                    
+                                                    
+                                                    <!-- Explore/Download/Request Button Block -->
+                                                    <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
+                                                                                                                (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
+                                                                                                                 and (!FilePage.fileMetadata.dataFile.filePackage or
+                                                                                                                       FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
+                                                        <ui:include src="file-download-button-fragment.xhtml">
+                                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
+                                                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
+                                                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
+                                                            <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
+                                                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                                                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                                                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                                            <ui:param name="isFilePg" value="true"/>
+                                                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                                                            <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
+                                                        </ui:include>
+                                                    </div>
+                                                    <!-- END: Explore/Download/Request Button Block -->
+                                                    
                                             
                                                     <!-- Map/Edit Button Block -->
                                                     <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                                        <!-- Map Data/Set Up Button Block -->
-                                                        <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
-                                                                                 and (FilePage.getConfigureTools().size() > 0
-                                                                                 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
-                                                            <ui:include src="file-configure-dropdown-fragment.xhtml">
-                                                                <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
-                                                                <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
-                                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
-                                                                <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
-                                                            </ui:include>		
-                                                        </ui:fragment>
-                                                        <!-- END: Map Data/Set Up Button Block -->
+                                                        
                                                         <!-- Edit Button Group -->
-                                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                        <div class="btn-group btn-group-justified" jsf:rendered="#{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()">
-                                                                <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
+                                                                #{bundle['dataset.editBtn']} FILE
                                                             </p:commandLink>
                                                         </div>
-                                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                        <div class="btn-group btn-group-justified" 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))}">
-                                                            <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>
-                                                            <ul class="dropdown-menu pull-right text-left" role="menu">
-                                                                <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
-                                                                <!--  Should be FilePage.isLockedFromEdits() ? -->
-                                                                    <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
-                                                                        <p:commandLink id="fileProvenanceButton"
-                                                                                   update="editProvenancePopup"
-                                                                                   oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
-                                                                                   <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
-                                                                                    #{bundle['file.provenance']} 
-                                                                        </p:commandLink>
-                                                                    </li> 
-                                                                </ui:fragment>
-                                                                <li>
-                                                                    <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
-                                                                        <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
-                                                                    </h:outputLink>
-                                                                </li>
-                                                                <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
-                                                                        <li>
-                                                                            <p:commandLink onclick="PF('accessPopup').show()">
-                                                                                <h:outputText value="#{bundle['file.restrict']}"/>
+                                                            <div class="btn-group">
+                                                                <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                                    #{bundle['dataset.editBtn']} FILE <span class="caret"></span>
+                                                                </button>
+                                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                                    <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
+                                                                    <!--  Should be FilePage.isLockedFromEdits() ? -->
+                                                                        <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                                                            <p:commandLink id="fileProvenanceButton"
+                                                                                       update="editProvenancePopup"
+                                                                                       oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                                                                                       <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
+                                                                                        #{bundle['file.provenance']} 
                                                                             </p:commandLink>
-                                                                        </li>
+                                                                        </li> 
+                                                                    </ui:fragment>
+                                                                    <li>
+                                                                        <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
+                                                                            <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
+                                                                        </h:outputLink>
+                                                                    </li>
+                                                                    <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
+                                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
+                                                                            <li>
+                                                                                <p:commandLink onclick="PF('accessPopup').show()">
+                                                                                    <h:outputText value="#{bundle['file.restrict']}"/>
+                                                                                </p:commandLink>
+                                                                            </li>
+                                                                        </ui:fragment>
+                                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
+                                                                            <li>
+                                                                                <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
+                                                                                    <h:outputText value="#{bundle['file.unrestrict']}"/>
+                                                                                </p:commandLink>
+                                                                            </li>
+                                                                        </ui:fragment>     
+                                                                    </ui:fragment>
+                                                                    <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
+                                                                    <li><!-- start: replace file link -->
+                                                                        <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
+                                                                             <h:outputText value="#{bundle['file.replace']}"/>
+                                                                        </h:outputLink>
+                                                                    <!-- end replace file link --></li>
                                                                     </ui:fragment>
-                                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
+                                                                    <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
+                                                                    <li><!-- start: already replaced replace file link -->
+                                                                        <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
+                                                                            <h:outputText value="#{bundle['file.replace']}"/>
+                                                                        </p:commandLink>
+                                                                    <!-- end replace file link --></li>
+                                                                    </ui:fragment>  
+                                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
                                                                         <li>
-                                                                            <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
-                                                                                <h:outputText value="#{bundle['file.unrestrict']}"/>
+                                                                            <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
+                                                                                <h:outputText value= "#{bundle['file.delete']}"/>
                                                                             </p:commandLink>
                                                                         </li>
-                                                                    </ui:fragment>     
-                                                                </ui:fragment>
-                                                                <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
-                                                                <li><!-- start: replace file link -->
-                                                                    <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
-                                                                         <h:outputText value="#{bundle['file.replace']}"/>
-                                                                    </h:outputLink>
-                                                                <!-- end replace file link --></li>
-                                                                </ui:fragment>
-                                                                <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
-                                                                <li><!-- start: already replaced replace file link -->
-                                                                    <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
-                                                                        <h:outputText value="#{bundle['file.replace']}"/>
-                                                                    </p:commandLink>
-                                                                <!-- end replace file link --></li>
-                                                                </ui:fragment>  
-                                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
+                                                                    </ui:fragment>
+                                                                    <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
                                                                     <li>
-                                                                        <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
-                                                                            <h:outputText value= "#{bundle['file.delete']}"/>
-                                                                        </p:commandLink>
                                                                     </li>
-                                                                </ui:fragment>
-                                                                <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
-                                                                <li>
-                                                                </li>
-                                                                </ui:fragment>
-                                                            </ul>
+                                                                    </ui:fragment>
+                                                                </ul>
+                                                            </div>
                                                         </div>
                                                         <!-- END: Edit Button Group -->
+                                                        
+                                                        
+                                                        
+                                                        <!-- Map Data/Set Up Button Block -->
+                                                        <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
+                                                                                 and (FilePage.getConfigureTools().size() > 0
+                                                                                 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
+                                                            <ui:include src="file-configure-dropdown-fragment.xhtml">
+                                                                <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
+                                                                <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
+                                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
+                                                                <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
+                                                            </ui:include>		
+                                                        </ui:fragment>
+                                                        <!-- END: Map Data/Set Up Button Block -->
+                                                        
+                                                        
                                                     </div>
                                                     <!-- END: Map/Edit Button Block -->
                                                     
-                                                    <!-- Explore/Download/Request Button Block -->
-                                                    <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
-                                                                                                                (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
-                                                                                                                 and (!FilePage.fileMetadata.dataFile.filePackage or
-                                                                                                                       FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
-                                                        <ui:include src="file-download-button-fragment.xhtml">
-                                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
-                                                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
-                                                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                                                            <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
-                                                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                                                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                                                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                                                            <ui:param name="isFilePg" value="true"/>
-                                                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
-                                                            <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
-                                                        </ui:include>
-                                                    </div>
-                                                    <!-- END: Explore/Download/Request Button Block -->
+                                                    
                                                     
                                                     <!-- Contact/Share Button Group -->
                                                     <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">