diff --git a/.gitignore b/.gitignore
index 2904bc578f2..ec135fb3618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,8 @@ scripts/installer/default.config
 tests/node_modules
 tests/package-lock.json
 venv
+
+# from thumbnail tests in SearchIT
+scripts/search/data/binary/trees.png.thumb140
+src/main/webapp/resources/images/cc0.png.thumb140
+src/main/webapp/resources/images/dataverseproject.png.thumb140
diff --git a/doc/release-notes/6684-buttons b/doc/release-notes/6684-buttons
new file mode 100644
index 00000000000..ad4233f6e80
--- /dev/null
+++ b/doc/release-notes/6684-buttons
@@ -0,0 +1 @@
+Note about how the buttons are the next steps towards the dataset and file redesign, mention previews on page, filtering/sorting options, tree view.
\ No newline at end of file
diff --git a/doc/sphinx-guides/source/api/dataaccess.rst b/doc/sphinx-guides/source/api/dataaccess.rst
index 8a809e679d5..a3fbdfd73f4 100755
--- a/doc/sphinx-guides/source/api/dataaccess.rst
+++ b/doc/sphinx-guides/source/api/dataaccess.rst
@@ -58,8 +58,8 @@ the following parameter values are supported (for image and pdf files only):
 ==============  ===========
 Value           Description
 ==============  ===========
-true            Generates a thumbnail image, by rescaling to the default thumbnail size (64 pixels)
-``N``           Rescales the image to ``N`` pixels.
+true            Generates a thumbnail image by rescaling to the default thumbnail size (64 pixels wide).
+``N``           Rescales the image to ``N`` pixels wide. ``imageThumb=true`` and ``imageThumb=64`` are equivalent.
 ==============  ===========
 
 Multiple File ("bundle") download
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataset.java b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
index 1930a915d12..5f1b0552d15 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataset.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
@@ -845,8 +845,8 @@ public boolean isAncestorOf( DvObject other ) {
         return equals(other) || equals(other.getOwner());
     }
 
-    public DatasetThumbnail getDatasetThumbnail() {
-        return DatasetUtil.getThumbnail(this);
+    public DatasetThumbnail getDatasetThumbnail(int size) {
+        return DatasetUtil.getThumbnail(this, size);
     }
     
     /** 
@@ -857,8 +857,8 @@ public DatasetThumbnail getDatasetThumbnail() {
      * @param datasetVersion
      * @return A thumbnail of the dataset (may be {@code null}).
      */
-    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion) {
-        return DatasetUtil.getThumbnail(this, datasetVersion);
+    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion, int size) {
+        return DatasetUtil.getThumbnail(this, datasetVersion, size);
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 27d6bbdde5e..cba68fb1ff7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -375,7 +375,7 @@ public String getThumbnailString() {
         }
 
         if (!readOnly) {
-            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (datasetThumbnail == null) {
                 thumbnailString = "";
                 return null;
@@ -391,7 +391,10 @@ public String getThumbnailString() {
 
             thumbnailString = datasetThumbnail.getBase64image();
         } else {
-            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(dataset, workingVersion.getId(),!workingVersion.isDraft());
+            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(dataset, 
+                    workingVersion.getId(),
+                    !workingVersion.isDraft(),
+                    ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (thumbnailString == null) {
                 thumbnailString = "";
                 return null;
@@ -1057,6 +1060,17 @@ public boolean canComputeAllFiles(boolean isCartCompute){
         }
         return true;
     }
+    
+    public boolean canDownloadFiles(){
+        //returns true if the page user has permission to download at least one file
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+             if (fileDownloadHelper.canDownloadFile(fmd)) {
+                 return true;
+             }
+        }
+        return false;
+    }
+    
     /*
     in getComputeUrl(), we are sending the container/dataset name and the exipiry and signature 
     for the temporary url of only ONE datafile within the dataset. This is because in the 
@@ -1802,7 +1816,7 @@ private String init(boolean initFull) {
         String nonNullDefaultIfKeyNotFound = "";
         protocol = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
         authority = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-        if (dataset.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset
+        if (this.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset
 
             DatasetVersionServiceBean.RetrieveDatasetVersionResponse retrieveDatasetVersionResponse = null;
 
@@ -2418,22 +2432,6 @@ public void edit(EditMode editMode) {
         this.readOnly = false;
     }
 
-    public String releaseDraft() {
-        if (releaseRadio == 1) {
-            return releaseDataset(true);
-        } else if(releaseRadio ==2) {
-            return releaseDataset(false);
-        } else if(releaseRadio ==3) {
-            return updateCurrentVersion();
-        } else {
-            return "Invalid Choice";
-        }
-    }
-
-    public String releaseMajor() {
-        return releaseDataset(false);
-    }
-
     public String sendBackToContributor() {
         try {
             //FIXME - Get Return Comment from sendBackToContributor popup
@@ -2484,7 +2482,22 @@ public String releaseParentDVAndDataset(){
     }
 
     public String releaseDataset() {
-        return releaseDataset(false);
+        if(!dataset.getOwner().isReleased()){
+            releaseParentDV();
+        }       
+        if(publishDatasetPopup()|| publishBothPopup() || !dataset.getLatestVersion().isMinorUpdate()){
+            return releaseDataset(false);
+        }        
+        switch (releaseRadio) {
+            case 1:
+                return releaseDataset(true);
+            case 2:
+                return releaseDataset(false);
+            case 3:
+                return updateCurrentVersion();
+            default:
+                return "Invalid Choice";
+        }
     }
     
     private void releaseParentDV(){
@@ -3764,17 +3777,95 @@ public boolean isLockedForAnyReason() {
         }
         return false;
     }
+    
+    public void processPublishButton() {
+        if (dataset.isReleased()) {
+            PrimeFaces.current().executeScript("PF('publishDataset').show()");
+        }
+
+        if (!dataset.isReleased()) {
+            if (dataset.getOwner().isReleased()) {
+                PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                return;
+            }
+            if (!dataset.getOwner().isReleased()) {
+                if (canPublishDataverse()) {
+                    if (dataset.getOwner().getOwner() == null
+                            || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                        return;
+                    }
+                    if ((dataset.getOwner().getOwner() != null && !dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('maynotPublishParent').show()");
+                    }
+
+                } else {
+                    PrimeFaces.current().executeScript("PF('mayNotRelease').show()");
+                }
+            }
+        }
+    }
 
+    public boolean releaseDraftPopup(){
+        return dataset.isReleased();
+    }
+    
+    public boolean publishDatasetPopup(){
+        if (!dataset.isReleased()) {
+            return dataset.getOwner().isReleased();
+        }
+       return false; 
+    }
+    
+    public boolean publishBothPopup() {
+        if (!dataset.getOwner().isReleased()) {
+            if (canPublishDataverse()) {
+                if (dataset.getOwner().getOwner() == null
+                        || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    } 
+    
+    public String getPublishButtonLabel(){
+        if(publishDatasetPopup() || releaseDraftPopup()){
+            BundleUtil.getStringFromBundle("continue");  
+        }
+        if(publishBothPopup()){
+            BundleUtil.getStringFromBundle("dataset.mayNotBePublished.both.button");
+        }        
+        return "";
+    }
+    
     private Boolean lockedFromEditsVar;
     private Boolean lockedFromDownloadVar;    
     private boolean lockedDueToDcmUpload;
     private Boolean lockedDueToIngestVar;
+    private Boolean lockedFromPublishingVar;
+
+    /**
+     * Authors are not allowed to publish but curators are allowed - when Dataset is inReview
+     * For all other locks edit should be locked for all editors.
+     */
+    public boolean isLockedFromPublishing() {
+        if (null == lockedFromPublishingVar || stateChanged) {
+            try {
+                permissionService.checkPublishDatasetLock(dataset, dvRequestService.getDataverseRequest(), new PublishDatasetCommand(dataset, dvRequestService.getDataverseRequest(), true));
+                lockedFromPublishingVar = false;
+            } catch (IllegalCommandException ex) {
+                lockedFromPublishingVar = true;
+            }
+        }
+        return lockedFromPublishingVar;
+    }
     /**
      * Authors are not allowed to edit but curators are allowed - when Dataset is inReview
      * For all other locks edit should be locked for all editors.
      */
     public boolean isLockedFromEdits() {
-        if(null == lockedFromEditsVar || stateChanged) {
+        if (null == lockedFromEditsVar || stateChanged) {
             try {
                 permissionService.checkEditDatasetLock(dataset, dvRequestService.getDataverseRequest(), new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest()));
                 lockedFromEditsVar = false;
@@ -3783,6 +3874,7 @@ public boolean isLockedFromEdits() {
             }
         }
         return lockedFromEditsVar;
+
     }
     
     /**
@@ -4076,12 +4168,18 @@ private List<DatasetVersion> resetReleasedVersionTabList() {
         }
         return retList;
     }
+    
+    public boolean isDisplayPublishPopupCustomText() {
+        if (dataset.isReleased()) {
+            return isDatasetPublishPopupCustomTextOnAllVersions() && !getDatasetPublishCustomText().isEmpty();
+        }
+        return !getDatasetPublishCustomText().isEmpty();
+    }
 
     public String getDatasetPublishCustomText(){
         String datasetPublishCustomText = settingsWrapper.getValueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
         if( datasetPublishCustomText!= null && !datasetPublishCustomText.isEmpty()){
-            return datasetPublishCustomText;
-            
+            return datasetPublishCustomText;        
         }
         return "";
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
index 6dbb39935fd..0853ee785bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -726,7 +726,7 @@ public Dataset setNonDatasetFileAsThumbnail(Dataset dataset, InputStream inputSt
             logger.fine("In setNonDatasetFileAsThumbnail but inputStream is null! Returning null.");
             return null;
         }
-        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnail(dataset, inputStream);
+        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnails(dataset, inputStream);
         dataset.setThumbnailFile(null);
         return merge(dataset);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
index 039ad4f6f27..9cc611e146a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetWidgetsPage.java
@@ -67,8 +67,8 @@ public String init() {
         if (!permissionsWrapper.canIssueCommand(dataset, UpdateDatasetVersionCommand.class)) {
             return permissionsWrapper.notAuthorized();
         }
-        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate);
-        datasetThumbnail = dataset.getDatasetThumbnail();
+        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+        datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (datasetThumbnail != null) {
             DataFile dataFile = datasetThumbnail.getDataFile();
             if (dataFile != null) {
@@ -117,7 +117,7 @@ public void setDatasetFileThumbnailToSwitchTo(DataFile datasetFileThumbnailToSwi
     public void setDataFileAsThumbnail() {
         logger.fine("setDataFileAsThumbnail clicked");
         updateDatasetThumbnailCommand = new UpdateDatasetThumbnailCommand(dvRequestService.getDataverseRequest(), dataset, UpdateDatasetThumbnailCommand.UserIntent.setDatasetFileAsThumbnail, datasetFileThumbnailToSwitchTo.getId(), null);
-        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
     }
 
@@ -146,7 +146,7 @@ public void handleImageFileUpload(FileUploadEvent event) {
             Logger.getLogger(DatasetWidgetsPage.class.getName()).log(Level.SEVERE, null, ex);
             return;
         }
-        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (base64image != null) {
             datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
         } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 4a7fcff0259..f8663087219 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -2512,7 +2512,7 @@ public void deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead() {
     }
 
     public boolean isThumbnailIsFromDatasetLogoRatherThanDatafile() {
-        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         return datasetThumbnail != null && !datasetThumbnail.isFromDataFile();
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
index 33b941ff9b7..bef27ec49b6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
@@ -708,28 +708,62 @@ public List<Long> getDvObjectIdsUserHasRoleOn(User user, List<DataverseRole> rol
 
     public void checkEditDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
         if (dataset.isLocked()) {
+            if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            // TODO: Do we need to check for "Workflow"? Should the message be more specific?
+            if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
+            if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
             if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
                 // The "InReview" lock is not really a lock for curators. They can still make edits.
                 if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
                     throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowedInReview"), command);
                 }
+            } else {
+                //catch all for locked for any other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
             }
+        }
+    }
+    
+    public void checkPublishDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
+        if (dataset.isLocked()) {
             if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             // TODO: Do we need to check for "Workflow"? Should the message be more specific?
             if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
             if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
+                // The "InReview" lock is not really a lock for curators. They can still publish
+                if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
+                    throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+                }
+            } else {
+                //catch all for locked for some other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
         }
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
index 51d803c5e02..6c8db8c124b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java
@@ -10,7 +10,6 @@
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import static edu.harvard.iq.dataverse.dataset.DatasetUtil.datasetLogoThumbnail;
-import static edu.harvard.iq.dataverse.dataset.DatasetUtil.thumb48addedByImageThumbConverter;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.io.File;
@@ -51,7 +50,7 @@ public class ThumbnailServiceWrapper implements java.io.Serializable  {
     private Map<Long, String> dvobjectThumbnailsMap = new HashMap<>();
     private Map<Long, DvObject> dvobjectViewMap = new HashMap<>();
 
-    private String getAssignedDatasetImage(Dataset dataset) {
+    private String getAssignedDatasetImage(Dataset dataset, int size) {
         if (dataset == null) {
             return null;
         }
@@ -70,9 +69,9 @@ private String getAssignedDatasetImage(Dataset dataset) {
                 return null;
             }
 
-            String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(
-                    assignedThumbnailFile,
-                    ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+            String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(assignedThumbnailFile,
+                    size);
+                    //ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
 
             if (imageSourceBase64 != null) {
                 this.dvobjectThumbnailsMap.put(assignedThumbnailFileId, imageSourceBase64);
@@ -183,9 +182,10 @@ public String getDatasetCardImageAsBase64Url(SolrSearchResult result) {
         
         Long versionId = result.getDatasetVersionId();
 
-        return getDatasetCardImageAsBase64Url(dataset, versionId, result.isPublishedState());
+        return getDatasetCardImageAsBase64Url(dataset, versionId, result.isPublishedState(), ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
     }
-    public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, boolean autoselect) {
+    
+    public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, boolean autoselect, int size) {
         Long datasetId = dataset.getId();
         if (datasetId != null) {
             if (this.dvobjectThumbnailsMap.containsKey(datasetId)) {
@@ -222,7 +222,8 @@ public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, bo
         // an auxilary file on the dataset level: 
         // (don't bother checking if it exists; just try to open the input stream)
         try {
-                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + ".thumb" + size);
+                        //thumb48addedByImageThumbConverter);
         } catch (Exception ioex) {
               //ignore
         }
@@ -248,7 +249,7 @@ public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, bo
 
         // If not, see if the dataset has one of its image files already assigned
         // to be the designated thumbnail:
-        cardImageUrl = this.getAssignedDatasetImage(dataset);
+        cardImageUrl = this.getAssignedDatasetImage(dataset, size);
 
         if (cardImageUrl != null) {
             //logger.info("dataset id " + result.getEntity().getId() + " has a dedicated image assigned; returning " + cardImageUrl);
@@ -297,7 +298,8 @@ public String getDatasetCardImageAsBase64Url(Dataset dataset, Long versionId, bo
             if (dataFileService.isThumbnailAvailable(thumbnailImageFile)) {
                 cardImageUrl = ImageThumbConverter.getImageThumbnailAsBase64(
                         thumbnailImageFile,
-                        ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                        size);
+                        //ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
             }
 
             if (cardImageUrl != null) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 037d6953798..9eb5989962c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -76,6 +76,7 @@
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -1281,9 +1282,9 @@ public Response getDatasetThumbnailMetadata(@PathParam("id") Long idSupplied) {
 			return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
 		}
 		JsonObjectBuilder data = Json.createObjectBuilder();
-		DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+		DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
 		data.add("isUseGenericThumbnail", dataset.isUseGenericThumbnail());
-		data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset));
+		data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
 		if (datasetThumbnail != null) {
 			data.add("datasetThumbnailBase64image", datasetThumbnail.getBase64image());
 			DataFile dataFile = datasetThumbnail.getDataFile();
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
index f93f5c7e171..628db853e5c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -82,6 +82,7 @@
 import edu.harvard.iq.dataverse.api.dto.RoleAssignmentDTO;
 import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataaccess.S3AccessIO;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.UnforcedCommandException;
@@ -1218,7 +1219,7 @@ public Response getDatasetThumbnailCandidates(@PathParam("id") String idSupplied
             }
             JsonArrayBuilder data = Json.createArrayBuilder();
             boolean considerDatasetLogoAsCandidate = true;
-            for (DatasetThumbnail datasetThumbnail : DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate)) {
+            for (DatasetThumbnail datasetThumbnail : DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE)) {
                 JsonObjectBuilder candidate = Json.createObjectBuilder();
                 String base64image = datasetThumbnail.getBase64image();
                 if (base64image != null) {
@@ -1243,7 +1244,7 @@ public Response getDatasetThumbnailCandidates(@PathParam("id") String idSupplied
     public Response getDatasetThumbnail(@PathParam("id") String idSupplied) {
         try {
             Dataset dataset = findDatasetOrDie(idSupplied);
-            InputStream is = DatasetUtil.getThumbnailAsInputStream(dataset);
+            InputStream is = DatasetUtil.getThumbnailAsInputStream(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
             if(is == null) {
                 return notFound("Thumbnail not available");
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
index 81b10567a78..1249e95494e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
@@ -63,6 +63,7 @@ public class ImageThumbConverter {
 
     public static int DEFAULT_CARDIMAGE_SIZE = 48;
     public static int DEFAULT_THUMBNAIL_SIZE = 64;
+    public static int DEFAULT_DATASETLOGO_SIZE = 140;
     public static int DEFAULT_PREVIEW_SIZE = 400;
 
     private static final Logger logger = Logger.getLogger(ImageThumbConverter.class.getCanonicalName());
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
index a5931da26f4..f6de6b0c3f5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -32,15 +32,17 @@
 import javax.imageio.ImageIO;
 import org.apache.commons.io.IOUtils;
 import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
+import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
+import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
 
 public class DatasetUtil {
 
     private static final Logger logger = Logger.getLogger(DatasetUtil.class.getCanonicalName());
     public static String datasetLogoFilenameFinal = "dataset_logo_original";
     public static String datasetLogoThumbnail = "dataset_logo";
-    public static String thumb48addedByImageThumbConverter = ".thumb48";
+    public static String thumbExtension = ".thumb";
 
-    public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boolean considerDatasetLogoAsCandidate) {
+    public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boolean considerDatasetLogoAsCandidate, int size) {
         List<DatasetThumbnail> thumbnails = new ArrayList<>();
         if (dataset == null) {
             return thumbnails;
@@ -62,7 +64,7 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
 
             InputStream in = null;
             try {
-                    in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+                    in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumbExtension + size);
             } catch (Exception ioex) {
             }
 
@@ -88,7 +90,7 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
                     && ImageThumbConverter.isThumbnailAvailable(dataFile)
                     && !dataFile.isRestricted()) {
                 String imageSourceBase64 = null;
-                imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(dataFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(dataFile, size);
 
                 if (imageSourceBase64 != null) {
                     DatasetThumbnail datasetThumbnail = new DatasetThumbnail(imageSourceBase64, dataFile);
@@ -107,7 +109,7 @@ public static List<DatasetThumbnail> getThumbnailCandidates(Dataset dataset, boo
      * @param datasetVersion
      * @return
      */
-    public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion datasetVersion) {
+    public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion datasetVersion, int size) {
         if (dataset == null) {
             return null;
         }
@@ -125,10 +127,11 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
         try {
             if (dataAccess == null) {
                 logger.warning("getThumbnail(): Failed to initialize dataset StorageIO for " + dataset.getStorageIdentifier());
-            } else if (dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter) != null) {
-                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            } else {
+                in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + ".thumb" + size);
             }
         } catch (IOException ex) {
+            in = null; 
             logger.fine("Dataset-level thumbnail file does not exist, or failed to open; will try to find an image file that can be used as the thumbnail.");
         }
 
@@ -160,7 +163,7 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
                         logger.fine("Dataset (id :" + dataset.getId() + ") does not have a thumbnail available that could be selected automatically.");
                         return null;
                     } else {
-                        String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                        String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, size);
                         DatasetThumbnail defaultDatasetThumbnail = new DatasetThumbnail(imageSourceBase64, thumbnailFile);
                         logger.fine("thumbnailFile (id :" + thumbnailFile.getId() + ") will get thumbnail through automatic selection from DataFile id " + thumbnailFile.getId());
                         return defaultDatasetThumbnail;
@@ -170,7 +173,7 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
                 logger.fine("Dataset (id :" + dataset.getId() + ") has a thumbnail the user selected but the file must have later been restricted. Returning null.");
                 return null;
             } else {
-                String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+                String imageSourceBase64 = ImageThumbConverter.getImageThumbnailAsBase64(thumbnailFile, size);
                 DatasetThumbnail userSpecifiedDatasetThumbnail = new DatasetThumbnail(imageSourceBase64, thumbnailFile);
                 logger.fine("Dataset (id :" + dataset.getId() + ")  will get thumbnail the user specified from DataFile id " + thumbnailFile.getId());
                 return userSpecifiedDatasetThumbnail;
@@ -179,11 +182,11 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
         }
     }
 
-    public static DatasetThumbnail getThumbnail(Dataset dataset) {
+    public static DatasetThumbnail getThumbnail(Dataset dataset, int size) {
         if (dataset == null) {
             return null;
         }
-        return getThumbnail(dataset, null);
+        return getThumbnail(dataset, null, size);
     }
 
     public static boolean deleteDatasetLogo(Dataset dataset) {
@@ -199,7 +202,8 @@ public static boolean deleteDatasetLogo(Dataset dataset) {
             }
 
             storageIO.deleteAuxObject(datasetLogoFilenameFinal);
-            storageIO.deleteAuxObject(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            storageIO.deleteAuxObject(datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+            storageIO.deleteAuxObject(datasetLogoThumbnail + thumbExtension + ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
 
         } catch (IOException ex) {
             logger.info("Failed to delete dataset logo: " + ex.getMessage());
@@ -252,7 +256,7 @@ public static DataFile attemptToAutomaticallySelectThumbnailFromDataFiles(Datase
         for (FileMetadata fmd : datasetVersion.getFileMetadatas()) {
             DataFile testFile = fmd.getDataFile();
             // We don't want to use a restricted image file as the dedicated thumbnail:
-            if (!testFile.isRestricted() && FileUtil.isThumbnailSupported(testFile) && ImageThumbConverter.isThumbnailAvailable(testFile, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE)) {
+            if (!testFile.isRestricted() && FileUtil.isThumbnailSupported(testFile) && ImageThumbConverter.isThumbnailAvailable(testFile, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE)) {
                 return testFile;
             }
         }
@@ -260,7 +264,7 @@ public static DataFile attemptToAutomaticallySelectThumbnailFromDataFiles(Datase
         return null;
     }
 
-    public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset dataset, InputStream inputStream) {
+    public static Dataset persistDatasetLogoToStorageAndCreateThumbnails(Dataset dataset, InputStream inputStream) {
         if (dataset == null) {
             return null;
         }
@@ -329,15 +333,28 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data
             logger.severe(ex.getMessage());
             return null;
         }
-        String thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE, tmpFileForResize.toPath().toString());
+        // We'll try to pre-generate the rescaled versions in both the 
+        // DEFAULT_DATASET_LOGO (currently 140) and DEFAULT_CARDIMAGE_SIZE (48)
+        String thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE, tmpFileForResize.toPath().toString());
+        logger.fine("thumbFileLocation = " + thumbFileLocation);
+        logger.fine("tmpFileLocation=" + tmpFileForResize.toPath().toString());
+        //now we must save the updated thumbnail 
+        try {
+            dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail+thumbExtension+ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+        } catch (IOException ex) {
+            logger.severe("Failed to move updated thumbnail file from " + tmpFile.getAbsolutePath() + " to its DataAccess location" + ": " + ex);
+        }
+        
+        thumbFileLocation = ImageThumbConverter.rescaleImage(fullSizeImage, width, height, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE, tmpFileForResize.toPath().toString());
         logger.fine("thumbFileLocation = " + thumbFileLocation);
         logger.fine("tmpFileLocation=" + tmpFileForResize.toPath().toString());
         //now we must save the updated thumbnail 
         try {
-            dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail+thumb48addedByImageThumbConverter);
+            dataAccess.savePathAsAux(Paths.get(thumbFileLocation), datasetLogoThumbnail+thumbExtension+ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         } catch (IOException ex) {
             logger.severe("Failed to move updated thumbnail file from " + tmpFile.getAbsolutePath() + " to its DataAccess location" + ": " + ex);
         }
+        
         //This deletes the tempfiles created for rescaling and encoding
         boolean tmpFileWasDeleted = tmpFile.delete();
         boolean originalTempFileWasDeleted = tmpFileForResize.delete();
@@ -351,11 +368,11 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data
         return dataset;
     }
 
-    public static InputStream getThumbnailAsInputStream(Dataset dataset) {
+    public static InputStream getThumbnailAsInputStream(Dataset dataset, int size) {
         if (dataset == null) {
             return null;
         }
-        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(size);
         if (datasetThumbnail == null) {
             return null;
         } else {
@@ -382,7 +399,7 @@ public static InputStream getThumbnailAsInputStream(Dataset dataset) {
      * file that is uploaded. Rather, we delete it after first creating at least
      * one thumbnail from it. 
      */
-    public static boolean isDatasetLogoPresent(Dataset dataset) {
+    public static boolean isDatasetLogoPresent(Dataset dataset, int size) {
         if (dataset == null) {
             return false;
         }
@@ -391,7 +408,7 @@ public static boolean isDatasetLogoPresent(Dataset dataset) {
 
         try {
             dataAccess = DataAccess.getStorageIO(dataset);
-            return dataAccess.isAuxObjectCached(datasetLogoThumbnail + thumb48addedByImageThumbConverter);
+            return dataAccess.isAuxObjectCached(datasetLogoThumbnail + thumbExtension + size);
         } catch (IOException ioex) {
         }
         return false;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
index ccb276a8b98..3f4b3c36b70 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetThumbnailCommand.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
@@ -71,7 +72,7 @@ public DatasetThumbnail execute(CommandContext ctxt) throws CommandException {
                     throw new CommandException("Could not find file based on id supplied: " + dataFileIdSupplied + ".", this);
                 }
                 Dataset ds1 = ctxt.datasets().setDatasetFileAsThumbnail(dataset, datasetFileThumbnailToSwitchTo);
-                DatasetThumbnail datasetThumbnail = ds1.getDatasetThumbnail();
+                DatasetThumbnail datasetThumbnail = ds1.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
                 if (datasetThumbnail != null) {
                     DataFile dataFile = datasetThumbnail.getDataFile();
                     if (dataFile != null) {
@@ -108,14 +109,14 @@ public DatasetThumbnail execute(CommandContext ctxt) throws CommandException {
                 Dataset datasetWithNewThumbnail = ctxt.datasets().setNonDatasetFileAsThumbnail(dataset, fileAsStream);
 		IOUtils.closeQuietly(fileAsStream);
                 if (datasetWithNewThumbnail != null) {
-                    return datasetWithNewThumbnail.getDatasetThumbnail();
+                    return datasetWithNewThumbnail.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
                 } else {
                     return null;
                 }
 
             case removeThumbnail:
                 Dataset ds2 = ctxt.datasets().removeDatasetThumbnail(dataset);
-                DatasetThumbnail datasetThumbnail2 = ds2.getDatasetThumbnail();
+                DatasetThumbnail datasetThumbnail2 = ds2.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
                 if (datasetThumbnail2 == null) {
                     return null;
                 } else {
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 38becbd841c..86c82c4c6ad 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -743,17 +743,11 @@ dataverse.publish.header=Publish Dataverse
 dataverse.nopublished=No Published Dataverses
 dataverse.nopublished.tip=In order to use this feature you must have at least one published dataverse.
 dataverse.contact=Email Dataverse Contact
-dataset.link=Link Dataset
 dataverse.link=Link Dataverse
 dataverse.link.btn.tip=Link to Your Dataverse
 dataverse.link.yourDataverses=Your Dataverse
 dataverse.link.yourDataverses.inputPlaceholder=Enter Dataverse Name
 dataverse.link.save=Save Linked Dataverse
-dataset.link.save=Save Linked Dataset
-dataset.link.not.to.owner=Can't link a dataset to its dataverse
-dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
-dataset.link.not.published=Can't link a dataset that has not been published
-dataset.link.not.available=Can't link a dataset that has not been published or is not harvested
 dataverse.link.dataverse.choose=Choose which of your dataverses you would like to link this dataverse to.
 dataverse.link.dataset.choose=Enter the name of the dataverse you would like to link this dataset to. If you need to remove this link in the future, please contact {0}.
 dataverse.link.dataset.none=No linkable dataverses available.
@@ -1220,7 +1214,18 @@ dataset.guestbookResponse.guestbook.responseTooLong=Please limit response to 255
 # dataset.xhtml
 dataset.configureBtn=Configure
 dataset.pageTitle=Add New Dataset
-dataset.editBtn=Edit
+
+dataset.accessBtn=Access Dataset
+dataset.accessBtn.header.download=Download Options
+dataset.accessBtn.header.explore=Explore Options
+dataset.accessBtn.header.compute=Compute Options
+dataset.linkBtn=Link Dataset
+dataset.contactBtn=Contact Owner
+dataset.shareBtn=Share
+
+dataset.publishBtn=Publish Dataset
+dataset.editBtn=Edit Dataset
+
 dataset.editBtn.itemLabel.upload=Files (Upload)
 dataset.editBtn.itemLabel.metadata=Metadata
 dataset.editBtn.itemLabel.terms=Terms
@@ -1295,7 +1300,13 @@ dataset.mayNotPublish.twoGenerations= This dataset cannot be published until {0}
 dataset.mayNotBePublished.both.button=Yes, Publish Both
 dataset.viewVersion.unpublished=View Unpublished Version
 dataset.viewVersion.published=View Published Version
-dataset.email.datasetContactBtn=Email Dataset Contact
+dataset.link.title=Link Dataset
+dataset.link.save=Save Linked Dataset
+dataset.link.not.to.owner=Can't link a dataset to its dataverse
+dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
+dataset.link.not.published=Can't link a dataset that has not been published
+dataset.link.not.available=Can't link a dataset that has not been published or is not harvested
+dataset.email.datasetContactTitle=Contact Dataset Owner
 dataset.email.hiddenMessage= 
 dataset.email.messageSubject=Test Message Subject
 dataset.email.datasetLinkBtn.tip=Link Dataset to Your Dataverse
@@ -1366,6 +1377,7 @@ dataset.message.locked.editNotAllowedInReview=Dataset cannot be edited due to In
 dataset.message.locked.downloadNotAllowedInReview=Dataset file(s) may not be downloaded due to In Review dataset lock.
 dataset.message.locked.downloadNotAllowed=Dataset file(s) may not be downloaded due to dataset lock.
 dataset.message.locked.editNotAllowed=Dataset cannot be edited due to dataset lock.
+dataset.message.locked.publishNotAllowed=Dataset cannot be published due to dataset lock.
 dataset.message.createSuccess=This dataset has been created
 dataset.message.createSuccess.failedToSaveFiles=Partial Success: The dataset has been created. But the file(s) could not be saved. Please try uploading the file(s) again.
 dataset.message.createSuccess.partialSuccessSavingFiles=Partial Success: The dataset has been created. But only {0} out of {1} files have been saved. Please try uploading the missing file(s) again.
@@ -1468,6 +1480,15 @@ file.replace.original=Original File
 file.editFiles=Edit Files
 file.editFilesSelected=Edit
 file.editFile=Edit
+
+file.accessBtn=Access File
+file.accessBtn.header.download=Download Options
+file.editBtn=Edit File
+file.contactBtn=Contact Owner
+file.shareBtn=Share
+file.share.title=Share File
+file.share.tip=Share this file on your favorite social media networks.
+file.share.text=View this file.
 file.bulkUpdate=Bulk Update
 file.uploadFiles=Upload Files
 file.replaceFile=Replace File
diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 7d3c582448a..f2a4be3f905 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -1,51 +1,55 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-     xmlns:h="http://java.sun.com/jsf/html"
-     xmlns:f="http://java.sun.com/jsf/core"
-     xmlns:ui="http://java.sun.com/jsf/facelets"
-     xmlns:c="http://java.sun.com/jsp/jstl/core"
-     xmlns:p="http://primefaces.org/ui"
-     xmlns:o="http://omnifaces.org/ui"
-     xmlns:jsf="http://xmlns.jcp.org/jsf">
-    
-    <div class="#{(widgetWrapper.widgetView or DatasetPage.workingVersion.deaccessioned) ? 'col-sm-12' : 'col-sm-9'} citation-block">
-        <div class="col-sm-12 #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
-            <div class="row ">
-                <div class="col-sm-12 citation">
-                    <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                        <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
-                    </span>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                    <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" 
-                          data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+        xmlns:h="http://java.sun.com/jsf/html"
+        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:c="http://java.sun.com/jsp/jstl/core"
+        xmlns:p="http://primefaces.org/ui"
+        xmlns:o="http://omnifaces.org/ui"
+        xmlns:jsf="http://xmlns.jcp.org/jsf">
+    <div class="citation-block">
+        <div class="clearfix #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+            <div class="citation #{DatasetPage.workingVersion.deaccessioned ? '' : 'margin-bottom'}">
+                <div class="pull-left preview-icon-block">
+                    <img src="#{DatasetPage.thumbnailString}" 
+                        class="img-responsive" 
+                        jsf:rendered="#{!empty DatasetPage.thumbnailString and !DatasetPage.workingVersion.deaccessioned}" 
+                        alt="#{DatasetPage.datasetVersionUI.title.value}"/>
+                    <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString or DatasetPage.workingVersion.deaccessioned}"/>
                 </div>
-                <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
-                    <div class="dropdown">
-                        <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                            <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li>
-                                <a jsf:id="endNoteLink" jsf:action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.dataset)}" >
-                                    #{bundle['dataset.cite.downloadBtn.xml']}
-                                </a>
-                            </li>
-                            <li>
-                                <a jsf:id="risLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationRIS(DatasetPage.dataset)}">
-                                    #{bundle['dataset.cite.downloadBtn.ris']}
-                                </a>
-                            </li>
-                            <li>
-                                <a jsf:id="bibLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationBibtex(DatasetPage.dataset)}" target="_blank">
-                                    #{bundle['dataset.cite.downloadBtn.bib']}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
+                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                    <h:outputText value="#{DatasetPage.displayCitation}" escape="false"/>
+                </span>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!DatasetPage.dataset.released}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.dataset.released and DatasetPage.workingVersion.draft}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}" 
+                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+            </div>
+            <div class="pull-left row col-sm-8 padding-none">
+                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown">
+                        #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu">
+                        <li>
+                            <a jsf:id="endNoteLink" jsf:action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.dataset)}" >
+                                #{bundle['dataset.cite.downloadBtn.xml']}
+                            </a>
+                        </li>
+                        <li>
+                            <a jsf:id="risLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationRIS(DatasetPage.dataset)}">
+                                #{bundle['dataset.cite.downloadBtn.ris']}
+                            </a>
+                        </li>
+                        <li>
+                            <a jsf:id="bibLink" jsf:actionListener="#{DatasetPage.fileDownloadService.downloadDatasetCitationBibtex(DatasetPage.dataset)}" target="_blank">
+                                #{bundle['dataset.cite.downloadBtn.bib']}
+                            </a>
+                        </li>
+                    </ul>
                 </div>
-                <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                     <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                 </div>
             </div>
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 34fae0ea0a6..52a833eb70d 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -38,13 +38,14 @@
                                             <f:param value="#{systemConfig.uploadLogoSizeLimit/1000}"/>
                                         </h:outputFormat>
                                     </p>
-                                    <div id="thumbnailPreview" class="col-sm-2 text-center">
-                                        <p>
-                                            <span class="icon-dataset text-info" style="font-size: 2.8em;" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"/>
-                                            <img src="#{DatasetWidgetsPage.datasetThumbnail.base64image}" alt="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.alt']}" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail != null}"/>
-                                        </p>
-                                        <span class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></span>
+                                    <div id="thumbnailPreview" class="col-sm-3 text-center">
+                                        <span class="icon-dataset text-primary" style="font-size:7em !important;color:#428BCA;line-height:1.2;" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"/>
+                                        <div class="text-muted" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail == null}"><em>#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.default']}</em></div>
+                                        
+                                        <img class="margin-bottom-half" src="#{DatasetWidgetsPage.datasetThumbnail.base64image}" alt="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.alt']}" jsf:rendered="#{DatasetWidgetsPage.datasetThumbnail != null}"/>
+                                        
                                         <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}
@@ -82,8 +83,6 @@
                                 <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:tab>
                     <p:tab id="widgetsTab" title="#{bundle['dataset.thumbnailsAndWidget.widgets.title']}">
                         <div id="no-widgets-message" class="panel panel-default" jsf:rendered="#{DatasetWidgetsPage.dataset.id.intValue() > 0 and !DatasetWidgetsPage.dataset.released}">
@@ -112,7 +111,6 @@
                                 </p>
                             </div>
                         </div>
-
                         <ui:fragment rendered="#{DatasetWidgetsPage.dataset.released}">
                             <p class="help-block">
                                 <h:outputFormat value="#{bundle['dataset.widgets.tip']}" escape="false">
@@ -145,51 +143,48 @@
                         </div>
                     </p:tab>
                 </p:tabView>
-                    
-                    <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
-                        <p class="help-block">
-                            <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
-                        </p>
-                        <div class="button-block">
-                            <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
-                                             action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
-                                             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">
-                        <div class="form-horizontal col-sm-12">
-                            <div class="form-group">
-                                <p class="help-block">#{bundle['dataset.thumbnailsAndWidget.availableThumbnails.tip']}</p>
-                                <p:outputPanel id="customPanel">
-                                    <p:selectOneRadio id="selectDatasetThumbnail" value="#{DatasetWidgetsPage.datasetFileThumbnailToSwitchTo}" layout="custom" converter="dataFileConverter">
-                                        <f:selectItems value="#{DatasetWidgetsPage.datasetThumbnails}" var="thumb" itemLabel="#{thumb}" itemValue="#{thumb.dataFile}"/>
-                                    </p:selectOneRadio>
-                                    <c:forEach items="#{DatasetWidgetsPage.datasetThumbnails}" var="thumbnail" varStatus="loop">
-                                        <div class="col-xs-4 text-center radio">
-                                            <p:radioButton for="selectDatasetThumbnail" id="opt#{loop.index}" itemIndex="#{loop.index}" />
-                                            <h:outputLabel for="opt#{loop.index}" style="padding:4px;">
-                                                <div style="height:48px;"><img src="#{thumbnail.base64image}" alt="#{thumbnail.filename}"/></div>
-                                                <h:outputText value="#{thumbnail.filename}"/>
-                                            </h:outputLabel>
-                                        </div>
-                                    </c:forEach>
-                                </p:outputPanel>
-                            </div>
-                        </div>
-                        <div class="button-block">
-                            <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>
+                <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
+                    <p class="help-block">
+                        <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataset.thumbnailsAndWidget.removeThumbnail.tip']}</span>
+                    </p>
+                    <div class="button-block">
+                        <p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confrmRemove').hide()"
+                                         action="#{DatasetWidgetsPage.flagDatasetThumbnailForRemoval()}"
+                                         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">
+                    <div class="form-horizontal col-sm-12">
+                        <div class="form-group">
+                            <p class="help-block">#{bundle['dataset.thumbnailsAndWidget.availableThumbnails.tip']}</p>
+                            <p:outputPanel id="customPanel">
+                                <p:selectOneRadio id="selectDatasetThumbnail" value="#{DatasetWidgetsPage.datasetFileThumbnailToSwitchTo}" layout="custom" converter="dataFileConverter">
+                                    <f:selectItems value="#{DatasetWidgetsPage.datasetThumbnails}" var="thumb" itemLabel="#{thumb}" itemValue="#{thumb.dataFile}"/>
+                                </p:selectOneRadio>
+                                <c:forEach items="#{DatasetWidgetsPage.datasetThumbnails}" var="thumbnail" varStatus="loop">
+                                    <div class="col-xs-4 text-center radio">
+                                        <p:radioButton for="selectDatasetThumbnail" id="opt#{loop.index}" itemIndex="#{loop.index}" />
+                                        <h:outputLabel for="opt#{loop.index}" style="padding:4px;">
+                                            <div><img src="#{thumbnail.base64image}" alt="#{thumbnail.filename}"/></div>
+                                            <h:outputText value="#{thumbnail.filename}"/>
+                                        </h:outputLabel>
+                                    </div>
+                                </c:forEach>
+                            </p:outputPanel>
                         </div>
-                    </p:dialog>
-
+                    </div>
+                    <div class="button-block">
+                        <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>
+                </p:dialog>
                </h:form>
             </ui:define>
         </ui:composition>
-
     </h:body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 4380ae255c5..658b429768e 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -20,7 +20,28 @@
             <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
             <ui:param name="locked" value="#{DatasetPage.locked}"/>
 	    <ui:param name="showMessagePanel" value="#{true}"/>
-	    <ui:define name="meta_header">
+            <ui:param name="showPublishLink" value="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion 
+                                                             and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                             and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"/>
+            
+            <ui:param name="showSubmitForReviewLink" value="#{DatasetPage.editMode != 'CREATE' and DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                                                            and !DatasetPage.datasetLockedInWorkflow
+                                                                            and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                                            and DatasetPage.canUpdateDataset()
+                                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"/>
+            <ui:param name="showReturnToAuthorLink" value="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
+                                                                            and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"/>
+        <!-- TO-DO #3513 DOWNLOAD ALL LINK -->
+            <!-- ADDED TOOLS SPECIFIC LOGIC TO DatasetPage.canDownloadFiles() RENDER LOGIC, CAN BE REMOVED WHEN DOWNLOAD ALL FILES IS WIRED UP -->
+            <ui:param name="showAccessDatasetButtonGroup" value="#{(DatasetPage.canDownloadFiles() 
+                                                                        and (DatasetPage.datasetExploreTools.size() >= 1 
+                                                                        or (DatasetPage.sessionUserAuthenticated and DatasetPage.showComputeButton())))
+                                                                   and (!DatasetPage.workingVersion.deaccessioned
+                                                                    or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))}"/>
+            <ui:param name="publishDataset" value="#{DatasetPage.publishDatasetPopup()}"/>
+            <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
+            <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
+            <ui:define name="meta_header">
             <meta name="description" content="#{DatasetPage.description}"/>
             </ui:define>
             <ui:define name="dc_meta_header">
@@ -80,109 +101,191 @@
                     <p:fragment id="topDatasetBlockFragment">
                     <div class="row" jsf:rendered="#{empty DatasetPage.editMode}">
                         <div class="col-xs-12">
-                            <div id="actionButtonBlock" class="col-xs-12 button-block" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                <div class="row">
+                            <div id="datasetVersionBlock" class="row">
+                                <div id="title-block" class="col-xs-12 margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
+                                    <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
+                                    <div id="title-label-block" class="margin-top-half">
+                                        <!-- DATASET Publication Status -->
+                                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
+                                        <!-- DATASET VERSION NUMBER -->
+                                        <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
+                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}"/>
+                                        <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
+                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
+                            <div id="datasetCitationActionSummaryBlock" class="row">
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9">
+                                    <!-- CITATION BLOCK -->
+                                    <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
+                                        <ui:include src="dataset-citation.xhtml">
+                                            <ui:param name="datasetPage" value="true"/>
+                                        </ui:include>
+                                    </ui:fragment>
+                                    <!-- END: CITATION BLOCK -->
+                                </div>
+
+                                <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
                                     <!-- ActionButtonBlock -->
-                                    <div class="col-xs-12 text-right padding-none">
-                                        <!-- Contact/Share Button Group -->
-                                        <div class="btn-group" id="datasetButtonBar" role="group">
-                                            <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
-                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                            </p:commandLink>
-                                            <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
-                                                           title="#{bundle['dataset.share.datasetShare']}"
-                                                           oncomplete="PF('shareDialog').show();sharrre();">
-                                                <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                            </p:commandLink>
+                                    <div id="actionButtonBlock" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                        <!-- DOWNLOAD/ACCESS DATASET -->
+                                        <div class="btn-group btn-group-justified" 
+                                             jsf:rendered="#{showAccessDatasetButtonGroup}">
+                                            <div class="btn-group">
+                                                <button type="button" class="btn btn-primary btn-access-dataset dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                    #{bundle['dataset.accessBtn']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left">
+                                                    
+                                                    <ui:remove>
+                                                    <!-- DOWNLOAD -->
+                                                    <!-- TO-DO #3513 DOWNLOAD ALL LINK -->
+                                                    <ui:fragment rendered="#{DatasetPage.canDownloadFiles()}">
+                                                        <li class="dropdown-header">#{bundle['dataset.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+                                                        <li class="disabled">
+                                                            <span class="ui-commandlink ui-widget ui-state-disabled btn-download">Download (Placeholder)</span>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <!-- END: DOWNLOAD -->
+                                                    </ui:remove>
+
+                                                    <!-- EXPLORE -->
+                                                    <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size() >= 1}">
+                                                        <li class="dropdown-header">#{bundle['dataset.accessBtn.header.explore']} <span class="glyphicon glyphicon-equalizer"/></li>
+                                                        <!-- Explore tool links -->
+                                                        <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
+                                                            <li>
+                                                                <h:commandLink action="#{DatasetPage.explore(tool)}">
+                                                                    <h:outputText value="#{tool.getDisplayNameLang()}"/>
+                                                                </h:commandLink>
+                                                            </li>
+                                                        </ui:repeat>
+                                                    </ui:fragment>
+                                                    <!-- END: EXPLORE -->
+
+                                                    <!-- COMPUTE -->
+                                                    <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                and DatasetPage.showComputeButton()}">
+                                                        <li class="dropdown-header">#{bundle['dataset.accessBtn.header.compute']} <span class="glyphicon glyphicon-flash"/></li>
+                                                        <li>
+                                                            <a tabindex="-1" href="#" id="computeBatch" class="btn-compute">#{bundle['dataset.compute.computeBtn']}</a>
+                                                            <ul class="dropdown-menu">
+                                                                <li>
+                                                                    <!-- Compute dataset link -->
+                                                                    <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
+                                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
+                                                                    </h:commandLink>
+                                                                </li>
+                                                                <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
+                                                                <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                                    <!-- Add link -->
+                                                                    <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
+                                                                        disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
+                                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
+                                                                    </p:commandLink>
+                                                                </li>
+                                                                <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
+                                                                    <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                                        <!-- Remove link -->
+                                                                        <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">
+                                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <li>
+                                                                        <!-- List link -->
+                                                                        <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
+                                                                                       value="#{bundle['dataset.compute.computeBatchList']}"
+                                                                                       oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
+                                                                                       update="computeBatchListPopup">
+                                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <li>
+                                                                        <!-- Clear link -->
+                                                                        <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">
+                                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
+                                                                        </p:commandLink>
+                                                                    </li>
+                                                                    <li>
+                                                                        <!-- Compute batch link -->
+                                                                        <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
+                                                                            <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
+                                                                        </h:outputLink>
+                                                                    </li>
+                                                                </ui:fragment>
+                                                            </ul>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <!-- END: COMPUTE -->
+                                                </ul>
+                                            </div>
                                         </div>
-                                        <!-- END: Contact/Share Button Group -->
-                                        <div class="btn-group" role="group">
-                                            <!-- Edit/Publish Button Group -->
-                                            <!-- Publish/Submit for Review/Return to Author Button Group -->
-                                            <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                                        and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                                        or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                                        and DatasetPage.canUpdateDataset()
-                                                                        and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
-                                                <!-- Publish Buttons -->
-                                                <p:commandLink styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) or (settingsWrapper.dataCiteInstallation and DatasetPage.dataset.globalIdCreateTime == null) ? '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 styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) or (settingsWrapper.dataCiteInstallation and DatasetPage.dataset.globalIdCreateTime == null) ? '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 styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) or (settingsWrapper.dataCiteInstallation and DatasetPage.dataset.globalIdCreateTime == null) ? '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 styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) or (settingsWrapper.dataCiteInstallation and DatasetPage.dataset.globalIdCreateTime == null) ? '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))
-                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                                </p:commandLink>
-                                                <p:commandLink styleClass="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) or (settingsWrapper.dataCiteInstallation and DatasetPage.dataset.globalIdCreateTime == null) ? '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)
-                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
-                                                               onclick="PF('maynotPublishParent').show()">
-                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                                </p:commandLink>
-                                                <!-- END: Publish Buttons -->
-                                                <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
-                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                                    <!-- Return to Author Button -->
-                                                    <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
-                                                                          onclick="PF('sendBackToContributor').show()">
-                                                        <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                                    </button>
-                                                    <!-- END: Return to Author Button -->
-                                                </ui:fragment>
-                                                <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)}">
-                                                    <!-- Submit for Review Button -->
-                                                    <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>
-                                                    <!-- End: Submit for Review Button -->
-                                                </ui:fragment>
-                                            </ui:fragment>
-                                            <!-- END: Publish/Submit for Review/Return to Author Button Group -->
-                                            <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
-                                                           styleClass="btn btn-default btn-access"   
-                                                           action="#{DatasetPage.setShowLinkingPopup(true)}"
-                                                           oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
-                                                           update="@form">
-                                                <span class="glyphicon glyphicon-link"/> #{bundle['link']}
-                                            </p:commandLink>
-                                            <!-- Edit Button -->
-                                            <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                              and DatasetPage.canUpdateDataset()
-                                                                                              and !DatasetPage.dataset.deaccessioned}">
-                                                <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
-                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                        <!-- END: DOWNLOAD/ACCESS DATASET -->
+
+                                        <!-- PUBLISH DATASET -->
+                                        <div class="btn-group btn-group-justified" jsf:rendered="#{showPublishLink or showSubmitForReviewLink}">
+                                            <div class="btn-group">
+                                                <!-- Publish BTN -->
+                                                <h:outputLink value="#" disabled="#{DatasetPage.lockedFromPublishing}">
+                                                    <c:if test="#{!(showSubmitForReviewLink or showReturnToAuthorLink)}">
+                                                        <f:passThroughAttribute name="class" value="btn btn-default btn-access btn-publish #{DatasetPage.lockedFromPublishing ? 'disabled' : ''}"/>
+                                                        <f:passThroughAttribute name="onclick" value="$(this).parent().find( 'li > a' ).trigger( 'click' );"/>
+                                                    </c:if>
+                                                    <c:if test="#{showSubmitForReviewLink or showReturnToAuthorLink}">
+                                                        <f:passThroughAttribute name="class" value="btn btn-default btn-access btn-publish dropdown-toggle #{DatasetPage.lockedFromPublishing ? 'disabled' : ''}"/>
+                                                        <f:passThroughAttribute name="data-toggle" value="dropdown"/>
+                                                        <f:passThroughAttribute name="aria-haspopup" value="true"/>
+                                                        <f:passThroughAttribute name="aria-expanded" value="false"/>
+                                                    </c:if>
+                                                    #{bundle['dataset.publishBtn']} <span jsf:rendered="#{showSubmitForReviewLink or showReturnToAuthorLink}" class="caret"></span>
+                                                </h:outputLink>
+                                                <!-- Publish BTN DROPDOWN-MENU OPTIONS -->
+                                                <ul class="dropdown-menu pull-right text-left">
+                                                    <li jsf:rendered="#{showPublishLink}" class="#{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}">
+                                                        <!-- Publish LINK -->
+                                                        <p:commandLink styleClass="#{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" 
+                                                                       disabled="#{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview}"
+                                                                       action="#{DatasetPage.processPublishButton()}">
+                                                            #{bundle['dataset.publish.btn']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li jsf:rendered="#{showReturnToAuthorLink}" class="#{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}">
+                                                        <!-- Return to Author LINK -->
+                                                        <p:commandLink class="#{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
+                                                                       disabled="#{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview}"
+                                                                       onclick="PF('sendBackToContributor').show()">
+                                                            #{bundle['dataset.rejectBtn']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li jsf:rendered="#{showSubmitForReviewLink}" class="#{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}">
+                                                        <!-- Submit for Review LINK -->
+                                                        <p:commandLink class="#{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                                       disabled="#{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked}"
+                                                                       onclick="PF('inreview').show()">
+                                                            #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <!-- END: Publish -->
+
+                                        <!-- Edit Dataset -->
+                                        <div class="btn-group btn-group-justified" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                                    and DatasetPage.canUpdateDataset()}">
+                                            <div class="btn-group">
+                                                <button type="button" id="editDataSet" class="btn btn-default btn-access btn-edit dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                        disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
+                                                    #{bundle['dataset.editBtn']} <span class="caret"></span>
                                                 </button>
-                                                <ul class="dropdown-menu pull-right text-left" role="menu">
-                                                    <li>                                           
+                                                <ul class="dropdown-menu pull-right text-left">
+                                                    <li>
                                                         <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
                                                             <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
                                                         </h:outputLink>
@@ -217,7 +320,7 @@
                                                                         </h:link>
                                                                     </li>
                                                                 </ul>
-                                                            </ui:fragment>                                            
+                                                            </ui:fragment>
                                                             <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
                                                                     styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
                                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
@@ -236,7 +339,7 @@
                                                         </h:outputLink>
                                                     </li>
                                                     <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                                        <li class="divider"></li>
+                                                        <li role="separator" class="divider"></li>
                                                         <li>
                                                             <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
                                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
@@ -244,7 +347,7 @@
                                                         </li>
                                                     </ui:fragment>
                                                     <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                                        <li class="divider"></li>
+                                                        <li role="separator" class="divider"></li>
                                                         <li>
                                                             <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
                                                                 <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
@@ -252,7 +355,7 @@
                                                         </li>
                                                     </ui:fragment>
                                                     <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                                        <li class="divider"></li>
+                                                        <li role="separator" class="divider"></li>
                                                         <li>
                                                             <p:commandLink id="deaccessionDatasetLink" 
                                                                            action="#{DatasetPage.clickDeaccessionDataset}"
@@ -263,262 +366,191 @@
                                                         </li>
                                                     </ui:fragment>
                                                 </ul>
-                                            </ui:fragment>
-                                            <!-- END: Edit Button -->
-                                            <!-- END: Edit/Link/Publish Button Group -->
-                                            <div class="btn-group" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
-                                                <!-- Explore Button Group -->
-                                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
-                                                    <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-                                                    </button>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
-                                                    <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
-                                                    </button>
-                                                </ui:fragment>
-                                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                                    <!-- Explore tool links -->
-                                                    <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
-                                                        <li>
-                                                            <h:commandLink action="#{DatasetPage.explore(tool)}">
-                                                                <h:outputText value="#{tool.getDisplayNameLang()}"/>
-                                                            </h:commandLink>
-                                                        </li>
-                                                    </ui:repeat>
-                                                </ul>
-                                            </div>
-                                            <div class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                          and !DatasetPage.dataset.deaccessioned
-                                                                                          and DatasetPage.showComputeButton()}">
-                                                <!-- Compute Button Group -->
-                                                <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
-                                                    <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
-                                                </button>
-                                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                                    <li>
-                                                        <!-- Compute dataset link -->
-                                                        <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
-                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
-                                                        </h:commandLink>
-                                                    </li>
-                                                    <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
-                                                    <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                                        <!-- Add link -->
-                                                        <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
-                                                            disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
-                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
-                                                        </p:commandLink>
-                                                    </li>
-                                                    <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
-                                                        <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                                            <!-- Remove link -->
-                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
-                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
-                                                            </p:commandLink>
-                                                        </li>
-                                                        <li>
-                                                            <!-- List link -->
-                                                            <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
-                                                                           value="#{bundle['dataset.compute.computeBatchList']}"
-                                                                           oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
-                                                                           update="computeBatchListPopup">
-                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
-                                                            </p:commandLink>
-                                                        </li>
-                                                        <li>
-                                                            <!-- Clear link -->
-                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
-                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
-                                                            </p:commandLink>
-                                                        </li>
-                                                        <li>
-                                                            <!-- Compute batch link -->
-                                                            <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
-                                                                <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
-                                                            </h:outputLink>
-                                                        </li>
-                                                    </ui:fragment>
-                                                </ul>
                                             </div>
                                         </div>
+                                        <!-- END: Edit Dataset -->
+
+                                        <!-- LINK -->
+                                        <div class="btn-group btn-group-justified" jsf:rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}">
+                                            <p:commandLink styleClass="btn btn-default btn-access btn-xs btn-block btn-link-dataset"
+                                                           action="#{DatasetPage.setShowLinkingPopup(true)}"
+                                                           oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
+                                                           update="@form">
+                                                #{bundle['dataset.linkBtn']}
+                                            </p:commandLink>
+                                        </div>
+                                        <!-- END: LINK -->
+
+                                        <!-- Contact/Share Button Group -->
+                                        <div class="btn-group btn-group-justified">
+                                            <p:commandLink styleClass="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
+                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
+                                                #{bundle['dataset.contactBtn']}
+                                            </p:commandLink>
+                                            <p:commandLink styleClass="btn btn-default btn-xs btn-share" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
+                                                           title="#{bundle['dataset.share.datasetShare']}"
+                                                           oncomplete="PF('shareDialog').show();sharrre();">
+                                                #{bundle['dataset.shareBtn']}
+                                            </p:commandLink>
+                                        </div>
+                                        <!-- END: Contact/Share Button Group -->
                                     </div>
                                     <!-- END: ActionButtonBlock -->
                                 </div>
-                            </div>
-                            <div id="datasetVersionBlock" class="row">
-                                <div class="col-xs-12">
-                                    <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
-                                        <div class="col-xs-1 vcenter title-preview-icon-block">
-                                            <img src="#{DatasetPage.thumbnailString}" jsf:rendered="#{!empty DatasetPage.thumbnailString}" alt="#{DatasetPage.datasetVersionUI.title.value}"/>
-                                            <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString}"/>
+
+                                <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" 
+                                     jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
+                                    <!-- Metrics -->
+                                    <div id="metrics-block">
+                                        <div id="metrics-heading">
+                                            #{bundle['metrics.dataset.title']}
+                                            <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
+                                                    data-trigger="hover" data-original-title="#{bundle['metrics.dataset.tip.default']}"></span>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top" 
+                                                    data-trigger="focus" data-html="true" data-content="#{bundle['metrics.dataset.tip.makedatacount']}"></a>
+                                            </ui:fragment>
                                         </div>
-                                        <div class="col-xs-11 vcenter">
-                                            <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
-                                            <div id="title-label-block" class="margin-top-half">
-                                                <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
-                                                <!-- DATASET VERSION NUMBER -->
-                                                <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                              value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
-                                                <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                              value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
+                                        <div id="metrics-body">
+                                            <!-- Classic downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
                                             </div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <!-- CITATION BLOCK -->
-                                        <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
-                                            <ui:include src="dataset-citation.xhtml">
-                                                <ui:param name="datasetPage" value="true"/>
-                                            </ui:include>
-                                        </ui:fragment>
-                                        <!-- END: CITATION BLOCK -->
-                                        <!-- Metrics -->
-                                        <div class="col-sm-3" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
-                                            <div id="metrics-block">
-                                            <div id="metrics-heading">
-                                                #{bundle['metrics.dataset.title']}
-                                                <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                        data-trigger="hover" data-original-title="#{bundle['metrics.dataset.tip.default']}"></span>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                    <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top" 
-                                                        data-trigger="focus" data-html="true" data-content="#{bundle['metrics.dataset.tip.makedatacount']}"></a>
-                                                </ui:fragment>
+                                            <!-- Make Data Count views -->
+                                            <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.views']}">
+                                                    <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
                                             </div>
-                                            <div id="metrics-body">
-                                                <!-- Classic downloads -->
-                                                <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                        <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
-                                                    </h:outputFormat>
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
-                                                </div>
-                                                <!-- Make Data Count views -->
-                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                    <h:outputFormat value="{0} #{bundle['metrics.views']}">
-                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
-                                                    </h:outputFormat>
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
-                                                </div>
-                                                <!-- Make Data Count downloads -->
-                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
-                                                    </h:outputFormat>
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
-                                                </div>
-                                                <!-- Make Data Count citations (DOIs only, not Handles) -->
-                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and settingsWrapper.doiInstallation}">
-                                                    <p:commandLink oncomplete="PF('citationsDialog').show();">
-                                                        <h:outputFormat value="{0} #{bundle['metrics.citations']}">
-                                                            <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
-                                                        </h:outputFormat>
-                                                    </p:commandLink>
-                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
-                                                </div>
+                                            <!-- Make Data Count downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
                                             </div>
+                                            <!-- Make Data Count citations (DOIs only, not Handles) -->
+                                            <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and settingsWrapper.doiInstallation}">
+                                                <p:commandLink oncomplete="PF('citationsDialog').show();">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.citations']}">
+                                                        <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
+                                                    </h:outputFormat>
+                                                </p:commandLink>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
                                             </div>
                                         </div>
-                                        <!-- END: Metrics -->
                                     </div>
-                                    <!-- DEACCESSION REASON -->
-                                    <div id="deaccession-reason-block" class="col-sm-12 bg-danger margin-bottom" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}">
+                                    <!-- END: Metrics -->
+                                </div>
+
+                                <!-- RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
+                                <div id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
+                                <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+
+                                <!-- DEACCESSION REASON -->
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}">
+                                    <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
                                         <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
                                         <p>#{DatasetPage.workingVersion.versionNote}</p>
                                         <ui:fragment rendered="#{!empty DatasetPage.workingVersion.archiveNote}">
                                             <p>#{bundle['dataset.beAccessedAt']} <a href="#{DatasetPage.workingVersion.archiveNote}" target="_blank">#{DatasetPage.workingVersion.archiveNote}</a></p>
                                         </ui:fragment>
                                     </div>
-                                    <!-- END: DEACCESSION REASON -->
-                                    <!-- BEGIN: DATASET SUMMARY -->
-                                    <div id="dataset-summary-metadata" class="row"
-                                         jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
-                                                         (!empty DatasetPage.datasetVersionUI.descriptionDisplay
-                                                         or !empty DatasetPage.datasetVersionUI.keywordDisplay
-                                                         or !empty DatasetPage.datasetVersionUI.subject.value
-                                                         or !empty DatasetPage.datasetVersionUI.relPublicationCitation
-                                                         or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}">
-                                        <div class="col-sm-12 metadata-container margin-bottom-half">
-                                            <table class="metadata">
-                                                <tbody>
-                                                    <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
-                                                        <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
-                                                            <th scope="row">
-                                                                #{bundle['dataset.keywordDisplay.title']}
-                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
-                                                            </th>
-                                                            <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
-                                                        </tr>
-                                                        <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
-                                                            <th scope="row">
-                                                                #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
-                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
-                                                            </th>
-                                                            <td>
-                                                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
-                                                                <a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{DatasetPage.datasetVersionUI.relPublicationId}</a>
-                                                            </td>
-                                                        </tr>
-                                                        <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
-                                                            <th scope="row">
-                                                                #{dsf.datasetFieldType.localeTitle}
-                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
-                                                            </th>
-                                                            <td>
-                                                                <!-- Primitive datasetFields -->
-                                                                <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
-                                                                    <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
-                                                                                  escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                                    <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                        <h:outputText value="#{loop.first?'':'; '}#{ value }"
-                                                                                      escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                                    </ui:repeat>
-                                                                </ui:fragment>
-                                                                <!-- Compound datasetFields -->
-                                                                <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
-                                                                    <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
-                                                                        <p class="help-block">
-                                                                            <h:outputText value="#{bundle['dataset.contact.tip']}"/>
-                                                                        </p>
-                                                                    </ui:fragment>
-                                                                    <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
-                                                                        <div>
-                                                                            <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
-                                                                                <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
-                                                                                <h:outputText value="#{cvPart.value}"
-                                                                                              escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
-                                                                            </ui:repeat>
-                                                                        </div>
+                                </div>
+                                <!-- END: DEACCESSION REASON -->
+
+                                <!-- BEGIN: DATASET SUMMARY -->
+                                <div id="dataset-summary-metadata" class="col-xs-12 col-sm-12 col-md-8 col-lg-9 metadata-container padding-none margin-bottom"
+                                     jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
+                                                     (!empty DatasetPage.datasetVersionUI.descriptionDisplay
+                                                     or !empty DatasetPage.datasetVersionUI.keywordDisplay
+                                                     or !empty DatasetPage.datasetVersionUI.subject.value
+                                                     or !empty DatasetPage.datasetVersionUI.relPublicationCitation
+                                                     or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}">
+                                    <table class="metadata">
+                                        <tbody>
+                                            <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
+                                                <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
+                                                    <th scope="row">
+                                                        #{bundle['dataset.keywordDisplay.title']}
+                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
+                                                    </th>
+                                                    <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
+                                                </tr>
+                                                <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
+                                                    <th scope="row">
+                                                        #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
+                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
+                                                    </th>
+                                                    <td>
+                                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
+                                                        <a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{DatasetPage.datasetVersionUI.relPublicationId}</a>
+                                                    </td>
+                                                </tr>
+                                                <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
+                                                    <th scope="row">
+                                                        #{dsf.datasetFieldType.localeTitle}
+                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                                    </th>
+                                                    <td>
+                                                        <!-- Primitive datasetFields -->
+                                                        <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
+                                                            <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
+                                                                          escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                            <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                <h:outputText value="#{loop.first?'':'; '}#{ value }"
+                                                                              escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                            </ui:repeat>
+                                                        </ui:fragment>
+                                                        <!-- Compound datasetFields -->
+                                                        <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
+                                                            <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
+                                                                <p class="help-block">
+                                                                    <h:outputText value="#{bundle['dataset.contact.tip']}"/>
+                                                                </p>
+                                                            </ui:fragment>
+                                                            <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
+                                                                <div>
+                                                                    <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
+                                                                        <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
+                                                                        <h:outputText value="#{cvPart.value}"
+                                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
                                                                     </ui:repeat>
-                                                                </ui:fragment>
-                                                            </td>
-                                                        </tr>
-                                                    </ui:repeat>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                    <!-- END: DATASET SUMMARY -->
+                                                                </div>
+                                                            </ui:repeat>
+                                                        </ui:fragment>
+                                                    </td>
+                                                </tr>
+                                            </ui:repeat>
+                                        </tbody>
+                                    </table>
                                 </div>
+                                <!-- END: DATASET SUMMARY -->
                             </div>
+                            <!-- END: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                         </div>
                     </div>
                     </p:fragment>
                     <!-- END Top Button/Citation Blocks -->
                     <!-- END View infoMode -->
+                    
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
@@ -551,10 +583,10 @@
                                                             styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                             var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
                                                 <p:column>
-                                                    <h:outputText value="#{hostDataverse.displayName}"/> 
+                                                    <h:outputText value="#{hostDataverse.displayName}"/>
                                                 </p:column>
                                                 <p:column>
-                                                    <h:outputText value="#{hostDataverse.alias}"/> 
+                                                    <h:outputText value="#{hostDataverse.alias}"/>
                                                 </p:column>
                                                 <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
                                                 <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
@@ -677,7 +709,7 @@
                         <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and (DatasetPage.editMode == 'CREATE')}">
                             <ui:include src="editFilesFragment.xhtml">
                                 <ui:param name="datasetPage" value="true"/>
-                                <ui:param name="editDatafilesPage" value="false"/>                                   
+                                <ui:param name="editDatafilesPage" value="false"/>
                                 <ui:param name="dataverse" value="#{DatasetPage.dataset.owner}"/>
                                 <ui:param name="dataset" value="#{DatasetPage.dataset}"/>
                                 <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
@@ -687,9 +719,10 @@
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{DatasetPage.selectedTabIndex}"
                                    rendered="#{empty DatasetPage.editMode or (DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE')}">
                             <p:ajax event="tabChange" listener="#{DatasetPage.tabChanged}" oncomplete="bind_bsui_components();" update="@this" />
-                            <p:tab id="dataFilesTab" title="#{bundle.files}" rendered="#{(!DatasetPage.workingVersion.deaccessioned or 
-                                                              (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))  and
-                                                              (empty DatasetPage.editMode)}">
+                            <p:tab id="dataFilesTab" title="#{bundle.files}" 
+                                   rendered="#{(!DatasetPage.workingVersion.deaccessioned 
+                                                or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset())) 
+                                                and (empty DatasetPage.editMode)}">
                                 <ui:include src="filesFragment.xhtml">
                                     <ui:param name="fileDownloadHelper" value="#{DatasetPage.fileDownloadHelper}"/>
                                 </ui:include>
@@ -701,21 +734,27 @@
                                              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 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)}">
+                                                   disabled="#{DatasetPage.lockedFromEdits}" 
+                                                   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"/>
                                         <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}">
+                                    <div class="btn-group" jsf:rendered="#{DatasetPage.dataset.released 
+                                                                           and (!DatasetPage.dataset.deaccessioned
+                                                                           or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))}">
                                         <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">
+                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{DatasetPage.exporters}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
                                                         <h:outputText value="#{exporter[0]}"/>
                                                     </h:outputLink>
-                                                </li>  
+                                                </li>
                                             </ui:repeat>
                                         </ul>
                                     </div>
@@ -755,7 +794,7 @@
                         <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>
-                        <button id="cancelCreate" styleClass="btn btn-link" value="#{bundle.cancel}" onclick="cancelDatasetCreate();return false;" rendered="#{DatasetPage.editMode == 'CREATE'}">#{bundle.cancel}</button>
+                        <button id="cancelCreate" class="btn btn-link" value="#{bundle.cancel}" onclick="cancelDatasetCreate();return false;" jsf:rendered="#{DatasetPage.editMode == 'CREATE'}">#{bundle.cancel}</button>
                         <p:remoteCommand name="cancelCreateCommand" process="@this" partialSubmit="true" async="true" update="" action="#{DatasetPage.cancelCreate}" rendered="#{DatasetPage.editMode == 'CREATE'}"/>     
                         <p:commandButton value="Direct" id="datasetSave"
                                          style="display:none"
@@ -929,7 +968,7 @@
                                 <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>                           
+                                    <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">
                                         <f:selectItems value="#{DatasetPage.releasedVersionTabList}" var="versionTab" itemLabel="#{bundle['file.deaccessionDialog.version']} #{versionTab.versionNumber}.#{versionTab.minorVersionNumber}, #{versionTab.versionDate}"  itemValue="#{versionTab}" />
@@ -956,7 +995,7 @@
                                     #{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"/>
@@ -1309,6 +1348,16 @@
                         </div>
                     </p:dialog>
                     <!-- END: Request Access Sign Up/Log In Button -->
+                    <p:dialog id="mapDataDialog" header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapDataDialog" modal="true">
+                        <p class="help-block">
+                            <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
+                        </p>
+                        <div class="button-block">
+                            <button type="button" class="btn btn-default" onclick="PF('mapDataDialog').hide();PF('blockDatasetForm').hide();">
+                                #{bundle.close}
+                            </button>
+                        </div>
+                    </p:dialog>
                     <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.getDisplayNameLang()}" widgetVar="configureToolPopup" modal="true">
                         <ui:include src="file-configure-popup-fragment.xhtml">
                             <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
@@ -1349,7 +1398,7 @@
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
-                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
+                    <p:dialog id="linkDatasetForm" styleClass="largePopUp" header="#{bundle['dataset.link.title']}" widgetVar="linkDatasetForm" modal="true" rendered="#{DatasetPage.showLinkingPopup}">
                         <p:focus for="dataverseLinkName"/>
                         <div class="form-horizontal">
                             <p class="help-block">
@@ -1360,7 +1409,7 @@
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                             <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        </p:commandLink>                                
+                                        </p:commandLink>
                                     </o:param>
                                 </h:outputFormat>
                             </p>
@@ -1382,10 +1431,10 @@
                                                         styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                         var="dataverseLk" itemLabel="#{dataverseLk.displayName}" itemValue="#{dataverseLk}" converter="dataverseConverter">
                                             <p:column>
-                                                <h:outputText value="#{dataverseLk.displayName}"/> 
+                                                <h:outputText value="#{dataverseLk.displayName}"/>
                                             </p:column>
                                             <p:column>
-                                                <h:outputText value="#{dataverseLk.alias}"/> 
+                                                <h:outputText value="#{dataverseLk.alias}"/>
                                             </p:column>
                                             <p:ajax process="@this" event="itemSelect" />
                                             <p:ajax process="@this" event="itemUnselect" />
@@ -1399,10 +1448,10 @@
                             <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']}">  
+                                           value="#{bundle['dataset.link.save']}">
                                 <f:param name="DO_DS_LINK_VALIDATION" value="true"/>
                             </p:commandButton>
-                            <button class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <button class="btn btn-link" onclick="PF('linkDatasetForm').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
@@ -1432,7 +1481,7 @@
                             <h:outputLink styleClass="btn btn-default" value="#{DatasetPage.cartComputeUrl}" onclick="PF('computeBatchListPopup').hide()" target="_blank">
                                 <h:outputText value="#{bundle['dataset.compute.computeBatchCompute']}"/>
                             </h:outputLink>
-                            <button class="btn btn-link" onclick="PF('computeBatchListPopup').hide();" type="button">                              
+                            <button class="btn btn-link" onclick="PF('computeBatchListPopup').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
@@ -1468,7 +1517,7 @@
                                                     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">                              
+                                <button class="btn btn-link" onclick="PF('accessPopup').hide();PF('blockDatasetForm').hide();" type="button">
                                     #{bundle.cancel}
                                 </button>
                             </div>
@@ -1481,89 +1530,71 @@
                         <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"/>
-                            <button class="btn btn-link" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button">                              
+                            <button class="btn btn-link" onclick="PF('inreview').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
                     </p:dialog>
                     <!-- Publish/Submit for Review Dialogs -->
-                    <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>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0}">
-                            <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"/>
-                            <button class="btn btn-link" onclick="PF('publishConfirm').hide();PF('blockDatasetForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <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">
-                                <o:param>
-                                    <a href="/dataverse/#{DatasetPage.dataset.owner.alias}" title="#{DatasetPage.dataset.owner.displayName}">
-                                        <h:outputText value="#{DatasetPage.dataset.owner.displayName}"/>
-                                    </a>
-                                </o:param>
-                            </h:outputFormat>
-                        </p>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0}">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetPublishCustomText)}" escape="false"/>
-                        </div>
-                        <p class="help-block">
+                    <p:dialog id="publishDataset" width="70%" header="#{bundle['dataset.publish.header']}" widgetVar="publishDataset" modal="true">
+                        <ui:fragment  rendered="#{publishDataset}">
+                            <p class="text-warning">
+                                <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.publish.tip']}
+                            </p>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseBoth}">
+                            <p class="text-warning">
+                                <span class="glyphicon glyphicon-warning-sign"/>
+                                <h:outputFormat value="#{bundle['dataset.mayNotPublish.both']}" escape="false">
+                                    <o:param>
+                                        <a href="/dataverse/#{DatasetPage.dataset.owner.alias}" title="#{DatasetPage.dataset.owner.displayName}">
+                                            <h:outputText value="#{DatasetPage.dataset.owner.displayName}"/>
+                                        </a>
+                                    </o:param>
+                                </h:outputFormat>
+                            </p>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseDraft}">
+                            <p:focus for="options"/>
+                            <p class="text-warning">
+                                <span class="glyphicon glyphicon-warning-sign" /> #{bundle['dataset.republish.tip']}
+                            </p>
+                        </ui:fragment>
+                        <ui:fragment rendered="#{releaseBoth}">
+                            <p class="help-block">
                             #{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"/>
-                            <button class="btn btn-link" onclick="PF('publishParent').hide();PF('blockDatasetForm').hide();" type="button">                              
-                                #{bundle.cancel}
-                            </button>
-                        </div>
-                    </p:dialog>
-                    <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>
-                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.datasetPublishCustomText.length() > 0 and DatasetPage.isDatasetPublishPopupCustomTextOnAllVersions()}">
-                            <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetPublishCustomText)}" escape="false"/>
+                            </p>
+                        </ui:fragment>
+                        <div id="terms-agreement-block" class="well" jsf:rendered="#{DatasetPage.displayPublishPopupCustomText}">
+                            <h:outputText value="#{DatasetPage.datasetPublishCustomText}" escape="false"/>
                         </div>
-                        <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}">
-                            <p class="help-block">
+                        <ui:fragment rendered="#{releaseDraft}">
+                            <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.minorUpdate}">
+                                <p class="help-block">
                                 #{bundle['dataset.selectVersionNumber']}
+                                </p>
+                                <p:selectOneRadio id="options" value="#{DatasetPage.releaseRadio}">
+                                    <f:selectItem itemLabel="#{bundle['dataset.minorRelease']} (#{DatasetPage.datasetNextMinorVersion})" itemValue="1" />
+                                    <f:selectItem itemLabel="#{bundle['dataset.majorRelease']} (#{DatasetPage.datasetNextMajorVersion})" itemValue="2" />
+                                    <c:if test="#{dataverseSession.user.isSuperuser()}">
+                                        <f:selectItem rendered="#" itemLabel="#{bundle['dataset.updateRelease']}" itemValue="3" />
+                                    </c:if>
+                                </p:selectOneRadio>
+                            </ui:fragment>
+                            <p>
+                                <h:outputFormat value="#{bundle['dataset.majorRelease.tip']}" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}">
+                                    <f:param value="#{DatasetPage.datasetNextMajorVersion}"/>
+                                </h:outputFormat>
                             </p>
-                            <p:selectOneRadio id="options" value="#{DatasetPage.releaseRadio}">
-                                <f:selectItem itemLabel="#{bundle['dataset.minorRelease']} (#{DatasetPage.datasetNextMinorVersion})" itemValue="1" />
-                                <f:selectItem itemLabel="#{bundle['dataset.majorRelease']} (#{DatasetPage.datasetNextMajorVersion})" itemValue="2" />
-                                <c:if test="#{dataverseSession.user.isSuperuser()}">
-                                    <f:selectItem rendered="#" itemLabel="#{bundle['dataset.updateRelease']}" itemValue="3" />
-                                </c:if>
-                            </p:selectOneRadio>
                         </ui:fragment>
-                        <p>
-                            <h:outputFormat value="#{bundle['dataset.majorRelease.tip']}" rendered="#{!DatasetPage.dataset.latestVersion.minorUpdate}">
-                                <f:param value="#{DatasetPage.datasetNextMajorVersion}"/>
-                            </h:outputFormat>
-                        </p>
                         <div class="button-block">
                             <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">                              
+                                             onclick="PF('publishDataset').hide();PF('blockDatasetForm').hide();" action="#{DatasetPage.releaseDataset}" immediate="true"/>
+                            <button class="btn btn-link" onclick="PF('publishDataset').hide();PF('blockDatasetForm').hide();" type="button">
                                 #{bundle.cancel}
                             </button>
                         </div>
-                    </p:dialog>
+                    </p:dialog>                     
                     <p:dialog id="mayNotRelease" header="#{bundle['dataset.publish.header']}" widgetVar="mayNotRelease" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/>
@@ -1576,7 +1607,7 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" 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>
@@ -1598,7 +1629,7 @@
                             </h:outputFormat>
                         </p>
                         <div class="button-block">
-                            <button class="btn btn-default" 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>
@@ -1621,12 +1652,12 @@
                         </ui:remove>
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('sendBackToContributor').hide()" action="#{DatasetPage.sendBackToContributor}"/>
-                            <button class="btn btn-link" 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:remoteCommand name="returnToAuthorCommand" action="#{DatasetPage.sendBackToContributor}"/>
                     <!-- END: Publish/Submit for Review Dialogs -->
                 </h:form>
                 <script>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 06edc64f1a6..3a1f6e84dc2 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -398,7 +398,7 @@
                         <div id="actionButtonBlock" class="col-xs-12 button-block" jsf:rendered="#{!widgetWrapper.widgetView}">
                             <div class="row">
                                 <!-- Metrics for Root Dataverse -->
-                                <div id="metrics-block" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
+                                <div id="metrics-block1" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
                                     <div id="metrics-label" class="col-xs-4 small text-center">
                                         <h:outputLink value="#{systemConfig.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{systemConfig.metricsUrl != null}">
                                             <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml
index adbba159d67..709184b3288 100644
--- a/src/main/webapp/dataverse_footer.xhtml
+++ b/src/main/webapp/dataverse_footer.xhtml
@@ -9,7 +9,7 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-    <div id="dataverseFooter" jsf:rendered="#{!widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
+    <div id="dataverseFooter" jsf:rendered="#{!widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
         <div class="container">
             <div class="row">
                 <div class="dataverseFooterLogo col-xs-12" style="text-align:#{!empty dataverse.dataverseTheme.logoFooterAlignment ? dataverse.dataverseTheme.logoFooterAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoFooterBackgroundColor ? dataverse.dataverseTheme.logoFooterBackgroundColor : 'FFFFFF'};">
@@ -50,5 +50,5 @@
             </div>
         </div>
     </div>
-    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetWrapper.widgetView}"/>
+    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetView}"/>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 64d91632ea5..d138b6da0a0 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -237,12 +237,15 @@
                 </div>
             </div>
         </div>
-	<p:fragment id="breadCrumbPanel" rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
+        <p:fragment id="breadCrumbPanel" rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 2 or (dataverseHeaderFragment.breadcrumbs.size() > 1 and dataverseHeaderFragment.breadcrumbs[1].dvObject.instanceofDataverse)}">
         <div id="breadcrumbNavBlock" class="container" jsf:rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
             <ui:repeat value="#{dataverseHeaderFragment.breadcrumbs}" var="breadcrumb" varStatus="status">
                 <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{!status.first}"/>
                 <div class="breadcrumbBlock">
-                    <h:outputText value="#{breadcrumb.breadcrumbText}" styleClass="#{'breadcrumbActive'}" rendered="#{status.last}"/>
+                    
+                    <!-- TO-DO, REMOVED HIGHLIGHTED CURRENT PAGE TITLE WITH false RENDER, NEED TO MOVE TO PGS...??? -->
+                    <h:outputText value="#{breadcrumb.breadcrumbText}" styleClass="#{'breadcrumbActive'}" rendered="#{false}"/>
+                    
                     <ui:fragment rendered="#{!status.last}">
                         <h:outputText value="#{breadcrumb.breadcrumbText}" rendered="#{!breadcrumb.dvObject.instanceofDataverse and !breadcrumb.dvObject.instanceofDataset and !breadcrumb.dvObject.instanceofDataFile and empty breadcrumb.url}"/>
                         <ui:fragment rendered="#{breadcrumb.dvObject == null and !empty breadcrumb.url}">
diff --git a/src/main/webapp/file-configure-dropdown-fragment.xhtml b/src/main/webapp/file-configure-dropdown-fragment.xhtml
index 4cd688df583..9af74fb2286 100644
--- a/src/main/webapp/file-configure-dropdown-fragment.xhtml
+++ b/src/main/webapp/file-configure-dropdown-fragment.xhtml
@@ -10,15 +10,51 @@
     xmlns:cc="http://java.sun.com/jsf/composite"
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
-        <div class="btn-group">
-            <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-cog"/> #{bundle['dataset.configureBtn']} <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu pull-right text-left" role="menu">
+        
+        <!-- Configure button -->
+        <!-- FILE PG -->
+        <li class="dropdown-submenu pull-left" jsf:rendered="#{isFilePg}">
+            
+            <a class="btn-configure" tabindex="-1" href="javascript:void(0);">
+                #{bundle['dataset.configureBtn']}
+            </a>
+            
+            <ul class="dropdown-menu multi-level" role="menu">
+                <!-- Worldmap unpublished -->
+                <li jsf:rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
+                    <p:commandLink onclick="PF('mapDataDialog').show()">
+                        #{bundle['file.map']}
+                    </p:commandLink>
+                </li>
+                <!-- Worldmap published -->
+                <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata)}">
+                    <a href="#{fileMetadata.dataFile.getMapItURL(dataverseSession.user.id)}">#{bundle['file.map']}</a>
+                </li>
+                <ui:repeat value="#{configureTools}" var="tool" rendered="#{dataverseSession.user.authenticated and canUpdateDataset and (fileMetadata.dataFile.tabularData or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
+                    <li>
+                        <p:commandLink update="@([id$=configureToolPopup])"
+                                        action="#{configureFragmentBean.setConfigurePopupTool(tool)}"
+                                        oncomplete="PF('configureToolPopup').show()">
+                                <f:actionListener binding="#{configureFragmentBean.setConfigureIds(fileId,fileMetadata.id)}"/>
+                                #{tool.displayName}
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+            </ul>
+        </li>
+        <!-- END: FILE PG -->
+        <!-- DATASET PG -->
+        <div class="btn-group dropdown" jsf:rendered="#{!isFilePg}">
+            <a type="button" class="btn-configure btn-access btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                    title="#{bundle['dataset.configureBtn']}" id="configureBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="glyphicon glyphicon-cog"/><span class="sr-only">#{bundle['dataset.configureBtn']}</span><span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu pull-right text-left" aria-labelledby="configureBtn">
                 <!-- Worldmap unpublished -->
                 <li jsf:rendered="#{worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
-                    <a onclick="PF('mapData_popup').show()" href="javascript:void(0);">#{bundle['file.map']}</a>
+                    <p:commandLink onclick="PF('mapDataDialog').show()">
+                        #{bundle['file.map']}
+                    </p:commandLink>
                 </li>
                 <!-- Worldmap published -->
                 <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata)}">
@@ -26,29 +62,21 @@
                 </li>
                 <ui:repeat value="#{configureTools}" var="tool" rendered="#{dataverseSession.user.authenticated and canUpdateDataset and (fileMetadata.dataFile.tabularData or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
                     <li>
-                        <p:commandLink
-                            update="@([id$=configureToolPopup])"
-                            action="#{configureFragmentBean.setConfigurePopupTool(tool)}"
-                            oncomplete="PF('configureToolPopup').show()">
-                            <f:actionListener binding="#{configureFragmentBean.setConfigureIds(fileId,fileMetadata.id)}" />
+                        <p:commandLink update="@([id$=configureToolPopup])"
+                                        action="#{configureFragmentBean.setConfigurePopupTool(tool)}"
+                                        oncomplete="PF('configureToolPopup').show()">
+                            <f:actionListener binding="#{configureFragmentBean.setConfigureIds(fileId,fileMetadata.id)}"/>
                             #{tool.getDisplayNameLang()}
                         </p:commandLink>
                     </li>
                 </ui:repeat>
             </ul>
         </div>
+        <!-- END: DATASET PG -->
+        <!-- END: Configure button -->
         
         <!-- Configure popup MOVED TO file configure popup fragment -->
 
-          <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>
-              <div class="button-block">
-                  <button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
-                      #{bundle.close}
-                  </button>
-              </div>
-          </p:dialog>
+        <!-- mapDataDialog popup MOVED TO dataset and file pg popup sections at bottom of pg -->
 
 </ui:composition>
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 683ea10d45e..061b1df00fa 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -11,33 +11,427 @@
     xmlns:o="http://omnifaces.org/ui"
     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
 
-    <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and canUpdateDataset}">
-        <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
-        <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
-            <span class="glyphicon glyphicon-warning-sign text-danger"/>
-        </span>
-    </ui:fragment>
-
-    <!--"Explore" button (dropdown of tools)-->
-    <!--exploreTools is set as a ui:param by the file and dataset pages-->
-    <!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
-    <div class="btn-group" jsf:rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-        <ui:fragment rendered="#{(exploreTools.size()==1 and !worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))  or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-            <button type="button" class="btn btn-default btn-explore"  onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-            </button>
+    <!-- Download Button -->
+    <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata)}">
+    <!-- FILE PG -->
+        <ui:fragment rendered="#{isFilePg}">
+            <li class="dropdown-header">#{bundle['file.accessBtn.header.download']} <span class="glyphicon glyphicon-download-alt"/></li>
+            <li jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
+                <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
+                                        and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                             styleClass="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)}" />
+                    <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
+                    <!-- package data file: -->
+                    <!-- no guest book/terms of use/etc. - straight package popup -->
+                    #{bundle.download}
+                </p:commandLink>
+                <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
+                                        and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                             styleClass="btn-download"
+                             process="@this"
+                             disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                             action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
+                             update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                    <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
+                    <!-- package data file: -->
+                    <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+                    #{bundle.download}
+                </p:commandLink>
+                <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
+                                          and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
+                             styleClass="btn-download"
+                             process="@this"
+                             disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                             actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
+                    <!-- non-tabular data file: -->
+                    <!-- no guest book/terms of use/etc. - straight to the download API url: -->
+                    #{bundle.download}
+                </p:commandLink>
+                <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
+                                          and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
+                             styleClass="btn-download"
+                             process="@this"
+                             disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                             action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
+                             update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                    <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+                    #{bundle.download}
+                </p:commandLink>
+            </li>
+            <!-- SUBMENU LINK -->
+            <ui:fragment rendered="#{fileMetadata.dataFile.tabularData}">
+                <ui:remove>
+                <li>
+                    <p:commandLink styleClass="highlightBold btn-download" rendered="#{!(downloadPopupRequired)}"
+                                   process="@this"
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'bundle')}">
+                        #{bundle['file.downloadBtn.format.all']}
+                    </p:commandLink>
+                    <p:commandLink styleClass="highlightBold btn-download" rendered="#{downloadPopupRequired}"
+                                   process="@this"
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'bundle' )}"
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        #{bundle['file.downloadBtn.format.all']}
+                    </p:commandLink>
+                </li>
+                <li role="presentation" class="divider"></li>
+                </ui:remove>
+                <li>
+                    <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'original')}">
+                        <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
+                            <!-- TODO: FIX VALUE LENGTH OVERLAPS SUBMENU PULL-FLOAT -->
+                            <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
+                        </h:outputFormat>
+                    </p:commandLink>
+                    <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'original' )}"
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
+                            <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
+                        </h:outputFormat>
+                    </p:commandLink>
+                </li>
+                <li>
+                    <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'tab')}">
+                        #{bundle['file.downloadBtn.format.tab']}
+                    </p:commandLink>
+                    <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired}"
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'tab' )}"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        #{bundle['file.downloadBtn.format.tab']}
+                    </p:commandLink>
+                </li>
+                <ui:fragment rendered="#{!(fileMetadata.dataFile.originalFormatLabel == 'RData')}">
+                    <li>
+                        <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
+                                       process="@this"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                       actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'RData')}">
+                            #{bundle['file.downloadBtn.format.rdata']}
+                        </p:commandLink>
+                        <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired}"
+                                       process="@this"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'RData' )}"
+                                       update="@widgetVar(downloadPopup)"
+                                       oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                            #{bundle['file.downloadBtn.format.rdata']}
+                        </p:commandLink>
+                    </li>
+                </ui:fragment>
+                <li>
+                    <p:commandLink styleClass="btn-download" rendered="#{!downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
+                        #{bundle['file.downloadBtn.format.var']}
+                    </p:commandLink>
+                    <p:commandLink styleClass="btn-download" rendered="#{downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        #{bundle['file.downloadBtn.format.var']}
+                    </p:commandLink>
+                </li>
+                <li class="dropdown-submenu pull-left">
+                    <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <h:commandLink id="risLinkFilePgNew" styleClass="btn-download" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
+                            </h:commandLink>
+                        </li>
+                        <li>
+                            <h:commandLink id="endNoteLinkFilePgNew" styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
+                            </h:commandLink>
+                        </li>
+                        <li>
+                            <h:commandLink id="bibLinkFilePgNew" styleClass="btn-download" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
+                            </h:commandLink>
+                        </li>
+                    </ul>
+                </li>
+            </ui:fragment>
+            <!-- END: SUBMENU LINK -->
+            <!-- UI HACK FIX SUBMENU PULL-FLOAT FIX -->
+            <li role="presentation" class="clearfix" jsf:rendered="#{isFilePg}"></li>
+        </ui:fragment>
+    <!-- END: FILE PG -->
+    <!-- DATASET PG -->
+        <ui:fragment rendered="#{!isFilePg}">
+        <!-- DOWNLOAD LINKS -->
+        <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
+                                  and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       title="#{bundle.download}"
+                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                       process="@this" update="@widgetVar(downloadPackagePopup)" oncomplete="PF('downloadPackagePopup').show();handleResizeDialog('downloadPackagePopup');">
+            <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" />
+            <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
+            <!-- package data file: -->
+            <!-- no guest book/terms of use/etc. - straight package popup -->
+            <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span>
+        </p:commandLink>
+        <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
+                                  and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       title="#{bundle.download}"
+                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
+                       process="@this" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+            <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
+            <!-- package data file: -->
+            <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+            <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span>
+        </p:commandLink>
+        <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
+                                    and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       title="#{bundle.download}"
+                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                       process="@this" actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
+            <!-- non-tabular data file: -->
+            <!-- no guest book/terms of use/etc. - straight to the download API url: -->
+            <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span>
+        </p:commandLink>
+        <p:commandLink rendered="#{!(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
+                                    and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
+                       styleClass="btn-download btn btn-link bootstrap-button-tooltip" 
+                       title="#{bundle.download}"
+                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                       action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
+                       process="@this" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+            <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
+            <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span>
+        </p:commandLink>
+        <!-- END:DOWNLOAD LINKS -->
+        <!-- TABULAR SUBMENU LINKS -->
+        <div class="btn-group" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
+            <!-- Download Dropdown -->
+            <a type="button" class="btn-download btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                          title="#{bundle.download}" id="downloadBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="glyphicon glyphicon-download-alt"/><span class="sr-only">#{bundle.download}</span><span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="downloadBtn">
+                <ui:remove>
+                    <li>
+                        <p:commandLink styleClass="highlightBold" rendered="#{!(downloadPopupRequired)}"
+                                       process="@this"
+                                       actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'bundle')}">
+                            #{bundle['file.downloadBtn.format.all']}
+                        </p:commandLink>
+                        <p:commandLink styleClass="highlightBold" rendered="#{downloadPopupRequired}"
+                                       process="@this"
+                                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'bundle' )}"
+                                       update="@widgetVar(downloadPopup)"
+                                       oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                            #{bundle['file.downloadBtn.format.all']}
+                        </p:commandLink>
+                    </li>
+                    <li role="presentation" class="divider"></li>
+                </ui:remove>
+                <li>
+                    <p:commandLink rendered="#{!downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'original')}">
+                        <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
+                            <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
+                        </h:outputFormat>
+                    </p:commandLink>
+                    <p:commandLink rendered="#{downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'original' )}"
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
+                            <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
+                        </h:outputFormat>
+                    </p:commandLink>
+                </li>
+                <li>
+                    <p:commandLink rendered="#{!downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'tab')}">
+                        #{bundle['file.downloadBtn.format.tab']}
+                    </p:commandLink>
+                    <p:commandLink rendered="#{downloadPopupRequired}"
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'tab' )}"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        #{bundle['file.downloadBtn.format.tab']}
+                    </p:commandLink>
+                </li>
+                <ui:fragment rendered="#{!(fileMetadata.dataFile.originalFormatLabel == 'RData')}">
+                    <li>
+                        <p:commandLink rendered="#{!downloadPopupRequired}"
+                                       process="@this"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                       actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'RData')}">
+                            #{bundle['file.downloadBtn.format.rdata']}
+                        </p:commandLink>
+                        <p:commandLink rendered="#{downloadPopupRequired}"
+                                       process="@this"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'RData' )}"
+                                       update="@widgetVar(downloadPopup)"
+                                       oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                            #{bundle['file.downloadBtn.format.rdata']}
+                        </p:commandLink>
+                    </li>
+                </ui:fragment>
+                <li>
+                    <p:commandLink rendered="#{!downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
+                        #{bundle['file.downloadBtn.format.var']}
+                    </p:commandLink>
+                    <p:commandLink rendered="#{downloadPopupRequired}"
+                                   process="@this"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" 
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
+                                   update="@widgetVar(downloadPopup)"
+                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                        #{bundle['file.downloadBtn.format.var']}
+                    </p:commandLink>
+                </li>
+                <li class="dropdown-submenu pull-left">
+                    <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <h:commandLink id="risLinkFile" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
+                            </h:commandLink>
+                        </li>
+                        <li>
+                            <h:commandLink id="endNoteLinkFile" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
+                            </h:commandLink>
+                        </li>
+                        <li>
+                            <h:commandLink id="bibLinkFile" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
+                                <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
+                            </h:commandLink>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+        <!-- END: TABULAR SUBMENU LINKS -->
         </ui:fragment>
-        <ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
-            <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span  class="caret"/>
-            </button>
+    <!-- END: DATASET PG -->
+    </ui:fragment>
+    <!-- Download Button -->
+    
+    <!-- Request Access Button -->
+    <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
+                             and fileMetadata.dataFile.owner.fileAccessRequest}">
+        <!-- FILE PG -->
+        <li class="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}"
+            jsf:rendered="#{isFilePg}">
+            <p:commandLink styleClass="btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
+                                                                    and !requestAccessPopupRequired}"
+                        process="@this"
+                        actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
+                        update="@this"
+                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            </p:commandLink>
+            <p:commandLink styleClass="btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
+                                                                    and requestAccessPopupRequired}"
+                        process="@this"
+                        actionListener="#{fileDownloadHelper.addFileForRequestAccess(fileMetadata.dataFile)}"
+                        onclick="PF('requestAccessPopup').show()"
+                        id="requestAccessPopupLink"
+                        disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
+                
+                <!-- TODO fix disabled styling span vs a -->
+                
+                #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
+            </p:commandLink>
+            <p:commandLink styleClass="btn-request" rendered="#{!fileDownloadHelper.session.user.authenticated }"
+                        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 -->
+                
+                #{bundle['file.requestAccess']}
+            </p:commandLink>
+        </li>
+        <!-- END: FILE PG -->
+        <ui:fragment rendered="#{!isFilePg}">
+        <!-- DATASET PG -->
+        
+        <!-- TODO - FIX UX INDICATOR YOUR REQUEST WAS SUBMITTED SINCE BTN LABEL IS NOW HIDDEN IN TITLE TOOLTIP
+                        FIX, WITH CSS POINTER-EVENTS VS JQUERY WORKAROUND, BUT... PRIMEFACES COMMANDLINK DIASABLED EMPTY TITLE BUG ???? -->
+        
+        <p:commandLink styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{fileDownloadHelper.session.user.authenticated 
+                                                                              and !requestAccessPopupRequired}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
+                       process="@this"
+                       actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
+                       update="@this"
+                       disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
+            <span class="glyphicon glyphicon-bullhorn"/><span class="sr-only">#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}</span>
+        </p:commandLink>
+        <p:commandLink styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{fileDownloadHelper.session.user.authenticated 
+                                                                              and requestAccessPopupRequired}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
+                       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"/><span class="sr-only">#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}</span>
+        </p:commandLink>
+        <p:commandLink styleClass="btn-request btn btn-link bootstrap-button-tooltip" rendered="#{!fileDownloadHelper.session.user.authenticated}"
+                       title="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}"
+                       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"/><span class="sr-only">#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}</span>
+        </p:commandLink>
+        <!-- END: DATASET PG -->
         </ui:fragment>
-        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
-            <!--external tools-->
+    </ui:fragment>
+    <!-- END: Request Access Button -->
+    
+    <!-- Explore button -->
+    <ui:fragment rendered="#{fileDownloadHelper.canDownloadFile(fileMetadata) and not empty exploreTools or (worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
+        <!--exploreTools is set as a ui:param by the file and dataset pages-->
+        <!--Note that "WorldMap Explore" is not an explore tool (external tool)-->
+
+        <!-- FILE PG -->
+        <ui:fragment rendered="#{isFilePg}">
+            <li class="dropdown-header">#{bundle['dataset.accessBtn.header.explore']} <span class="glyphicon glyphicon-equalizer"/></li>
+            <!-- externalTools -->
             <ui:repeat var="tool" value="#{exploreTools}">
                 <li>
                     <p:commandLink rendered="#{!downloadPopupRequired}"
-                                   styleClass="#{(fileMetadata.dataFile.ingestInProgress) ? 'disabled' : ''}"
+                                   styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
                                    disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
                                    action="#{fileDownloadService.explore(guestbookResponse, fileMetadata, tool )}">
                         #{tool.getDisplayNameLang()}
@@ -45,7 +439,8 @@
                     <!--The modifyDatafileAndFormat method below was added because on the dataset page, "tool" is null in the popup so we store it in the guestbookResponse because we know we'll need it later in the popup.-->
                     <p:commandLink rendered="#{downloadPopupRequired}"
                                    action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'externalTool', tool)}"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                   styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload)}"
                                    process="@this"
                                    update="@widgetVar(downloadPopup)"
                                    oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
@@ -53,237 +448,116 @@
                     </p:commandLink>
                 </li>
             </ui:repeat>
-            <!--WorldMap Explore-->
+            <!-- END: externalTools -->
+            <!-- WorldMap -->
             <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">
                 <h:commandLink rendered="#{!downloadPopupRequired}"
-                               styleClass="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               
-                               action="#{fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fileMetadata )}" target="_blank">
+                               styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               action="#{fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fileMetadata )}" 
+                               target="_blank" rel="noopener">
                     #{bundle['file.mapData.worldMap']}
                 </h:commandLink>
                 <p:commandLink rendered="#{downloadPopupRequired}"
-                               styleClass="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}"
-                               disabled="#{fileMetadata.dataFile.ingestInProgress  or lockedFromDownload}"
+                               styleClass="btn-explore #{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                               disabled="#{fileMetadata.dataFile.ingestInProgress or lockedFromDownload}"
                                process="@this"
                                action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'worldMap' )}"
                                update="@widgetVar(downloadPopup)"
                                oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
                     #{bundle['file.mapData.worldMap']}
                 </p:commandLink>
-            </li>                       
-        </ul>
-    </div>
-    
-    <!-- Compute Button *File pg only*: -->
-    <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)}" 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}"
-                   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)}" />
-        <f:actionListener binding="#{fileDownloadService.writeGuestbookResponseRecord(guestbookResponse, fileMetadata, 'package')}" />
-        <!-- package data file: -->
-        <!-- no guest book/terms of use/etc. - straight package popup -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and (downloadPopupRequired) 
-                              and fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}"
-                   update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-        <f:actionListener binding="#{packagePopupFragmentBean.setFileMetadata(fileMetadata)}" /> 
-        <!-- package data file: -->
-        <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and !(downloadPopupRequired) 
-                                and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'Download')}">
-        <!-- non-tabular data file: -->
-        <!-- no guest book/terms of use/etc. - straight to the download API url: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <p:commandLink rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and !(fileMetadata.dataFile.tabularData) and downloadPopupRequired 
-                                and !(fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}"
-                   styleClass="btn btn-default btn-download"
-                   process="@this"
-                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                   action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}"
-                   update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-        <!-- guest book or terms of use, etc. enabled - open "download popup" first: -->
-        <span class="glyphicon glyphicon-download-alt"/> #{bundle.download}
-    </p:commandLink>
-
-    <div class="btn-group" jsf:rendered="#{ fileDownloadHelper.canDownloadFile(fileMetadata) and fileMetadata.dataFile.tabularData }">
-        <!-- Download Dropdown -->
-        <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">
-            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"/>
-        </button>
-        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
-            <ui:remove>
-                <li>
-                    <p:commandLink styleClass="highlightBold" rendered="#{!(downloadPopupRequired)}"
-                                   process="@this"
-                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'bundle')}">
-                        #{bundle['file.downloadBtn.format.all']}
-                    </p:commandLink>
-                    <p:commandLink styleClass="highlightBold" rendered="#{downloadPopupRequired}"
-                                   process="@this"
-                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'bundle' )}"
-                                   update="@widgetVar(downloadPopup)"
-                                   oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                        #{bundle['file.downloadBtn.format.all']}
-                    </p:commandLink>
-                </li>
-                <li role="presentation" class="divider"></li>
-            </ui:remove>
-            <li>
-                <p:commandLink rendered="#{!downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'original')}">
-                    <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
-                        <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
-                    </h:outputFormat>
-                </p:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired and !(fileMetadata.dataFile.originalFormatLabel == 'UNKNOWN')}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'original' )}"
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    <h:outputFormat value="#{bundle['file.downloadBtn.format.original']}">
-                        <f:param value="#{fileMetadata.dataFile.originalFormatLabel}"/>
-                    </h:outputFormat>
-                </p:commandLink>
             </li>
-            <li>
-                <p:commandLink rendered="#{!downloadPopupRequired}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'tab')}">
-                    #{bundle['file.downloadBtn.format.tab']}
-                </p:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired}"
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'tab' )}"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    #{bundle['file.downloadBtn.format.tab']}
-                </p:commandLink>
-            </li>
-            <ui:fragment rendered="#{!(fileMetadata.dataFile.originalFormatLabel == 'RData')}">
-                <li>
-                    <p:commandLink rendered="#{!downloadPopupRequired}"
-                                   process="@this"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                                   actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'RData')}">
-                        #{bundle['file.downloadBtn.format.rdata']}
-                    </p:commandLink>
+            <!-- END: WorldMap -->
+        </ui:fragment>
+        <!-- END: FILE PG -->
+        
+        <!-- DATASET PG -->
+        <div class="btn-group" jsf:rendered="#{!isFilePg}">
+            <ui:fragment rendered="#{(exploreTools.size()==1 and !worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)) or (exploreTools.size()==0 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
+                <a class="btn-explore btn btn-link bootstrap-button-tooltip" 
+                               title="#{bundle.explore}" id="exploreBtn" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
+                    <span class="glyphicon glyphicon-equalizer"/><span class="sr-only">#{bundle.explore}</span>
+                </a>
+            </ui:fragment>
+            <ui:fragment rendered="#{exploreTools.size()>1 or (exploreTools.size()>=1 and worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata))}">
+                <a class="btn-explore btn btn-link bootstrap-button-tooltip dropdown-toggle" 
+                               title="#{bundle.explore}" id="exploreBtn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="glyphicon glyphicon-equalizer"/><span class="sr-only">#{bundle.explore}</span><span class="caret"></span>
+                </a>
+            </ui:fragment>
+            <ul class="dropdown-menu multi-level pull-right text-left" aria-labelledby="exploreBtn">
+                <!--external tools-->
+                <ui:repeat var="tool" value="#{exploreTools}">
+                    <li>
+                        <p:commandLink rendered="#{!downloadPopupRequired}"
+                                       styleClass="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                       action="#{fileDownloadService.explore(guestbookResponse, fileMetadata, tool )}">
+                            #{tool.getDisplayNameLang()}
+                        </p:commandLink>
+                        <!--The modifyDatafileAndFormat method below was added because on the dataset page, "tool" is null in the popup so we store it in the guestbookResponse because we know we'll need it later in the popup.-->
+                        <p:commandLink rendered="#{downloadPopupRequired}"
+                                       action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'externalTool', tool)}"
+                                       styleClass="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                       disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                       process="@this"
+                                       update="@widgetVar(downloadPopup)"
+                                       oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
+                            #{tool.getDisplayNameLang()}
+                        </p:commandLink>
+                    </li>
+                </ui:repeat>
+                <!--WorldMap Explore-->
+                <li jsf:rendered="#{worldMapPermissionHelper.canUserSeeExploreWorldMapButtonFromPage(fileMetadata)}">
+                    <h:commandLink rendered="#{!downloadPopupRequired}"
+                                   styleClass="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                   disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                   action="#{fileDownloadService.startWorldMapDownloadLink(guestbookResponse, fileMetadata )}" 
+                                   target="_blank" rel="noopener">
+                        #{bundle['file.mapData.worldMap']}
+                    </h:commandLink>
                     <p:commandLink rendered="#{downloadPopupRequired}"
+                                   styleClass="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}"
+                                   disabled="#{fileMetadata.dataFile.ingestInProgress or lockedFromDownload}"
                                    process="@this"
-                                   disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'RData' )}"
+                                   action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'worldMap' )}"
                                    update="@widgetVar(downloadPopup)"
                                    oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                        #{bundle['file.downloadBtn.format.rdata']}
+                        #{bundle['file.mapData.worldMap']}
                     </p:commandLink>
                 </li>
-            </ui:fragment>
-            <li>
-                <p:commandLink rendered="#{!downloadPopupRequired}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               actionListener="#{fileDownloadService.writeGuestbookAndStartFileDownload(guestbookResponse, fileMetadata, 'var')}">
-                    #{bundle['file.downloadBtn.format.var']}
-                </p:commandLink>
-                <p:commandLink rendered="#{downloadPopupRequired}"
-                               process="@this"
-                               disabled="#{(fileMetadata.dataFile.ingestInProgress  or lockedFromDownload) ? 'disabled' : ''}" 
-                               action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'var' )}"
-                               update="@widgetVar(downloadPopup)"
-                               oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');">
-                    #{bundle['file.downloadBtn.format.var']}
-                </p:commandLink>
-            </li>
-            <li class="dropdown-submenu pull-left">
-                <a tabindex="-1" href="javascript:void(0);">#{bundle['file.downloadBtn.format.citation']}</a>
-                <ul class="dropdown-menu">
-                    <li>
-                        <h:commandLink id="risLinkFile" actionListener="#{fileDownloadService.downloadDatafileCitationRIS(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.ris']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink id="endNoteLinkFile" action="#{fileDownloadService.downloadDatafileCitationXML(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.xml']}" />
-                        </h:commandLink>
-                    </li>
-                    <li>
-                        <h:commandLink id="bibLinkFile" action="#{fileDownloadService.downloadDatafileCitationBibtex(fileMetadata)}">
-                            <h:outputText value="#{bundle['dataset.cite.downloadBtn.bib']}" />
-                        </h:commandLink>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </div>        
-    <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}"
-                   process="@this"
-                   actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
-                   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 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}"
-                   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 styleClass="btn btn-default btn-request" rendered="#{!fileDownloadHelper.session.user.authenticated 
-                                                                          and !fileMetadata.datasetVersion.deaccessioned
-                                                                          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']}
-    </p:commandLink>
+            </ul>
+        </div>
+        <!-- END: DATASET PG -->
+    </ui:fragment>
+    <!-- Explore button -->
+
+    <!-- Compute Button *FILE PG only*: -->
+    <li jsf:rendered="#{isFilePg and FilePage.showComputeButton() and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+        <h:outputLink value="#{FilePage.computeUrl}" styleClass="btn-compute" 
+                      target="_blank" rel="noopener">
+            #{bundle['file.compute']}
+        </h:outputLink>
+    </li>
+    <!-- END: Compute Button *FILE PG only*: -->
+ 
+    <!-- Compute Button *DATASET PG only*: -->
+    <h:outputLink styleClass="btn-compute btn btn-link bootstrap-button-tooltip" 
+                  title="#{bundle['file.compute']}" value="#{DatasetPage.getComputeUrl(fileMetadata)}"
+                  target="_blank" rel="noopener"
+                  rendered="#{!isFilePg and DatasetPage.showComputeButton(fileMetadata) and fileDownloadHelper.canDownloadFile(fileMetadata)}"> 
+        <span class="glyphicon glyphicon-flash"/><span class="sr-only">#{bundle['file.compute']}</span>
+    </h:outputLink>
+    <!-- END: Compute Button *DATASET PG only*: -->
+    
     <script type="text/javascript">
-      function downloadFiles(url, filelist) {
-        filelist=filelist + ','; //Prevents last file from being dropped on server
-        var form = $('<form></form>').attr('action', url).attr('method', 'post').attr('enctype','text/plain');
-        form.append($("<input></input>").attr('type', 'hidden').attr('name', 'fileIds').attr('value', filelist));
-        //Submit and then remove form
-        form.appendTo('body').submit().remove();
-      }
+        function downloadFiles(url, filelist) {
+          filelist=filelist + ','; //Prevents last file from being dropped on server
+          var form = $('<form></form>').attr('action', url).attr('method', 'post').attr('enctype','text/plain');
+          form.append($("<input></input>").attr('type', 'hidden').attr('name', 'fileIds').attr('value', filelist));
+          //Submit and then remove form
+          form.appendTo('body').submit().remove();
+        }
     </script>
-</ui:composition>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 5183761a86e..bb372c84edf 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -18,341 +18,368 @@
             <ui:param name="pageTitle" value="#{FilePage.fileMetadata.dataFile.displayName} - #{FilePage.file.owner.owner.displayName}"/>
             <ui:param name="dataverse" value="#{FilePage.file.owner.owner}"/>
             <ui:param name="showMessagePanel" value="#{true}"/>
+            <ui:param name="showAccessFileButtonGroup" value="#{fileDownloadHelper.canDownloadFile(FilePage.fileMetadata)
+                                                                  or (!fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) and FilePage.fileMetadata.dataFile.owner.fileAccessRequest)
+                                                                  and (!FilePage.fileMetadata.datasetVersion.deaccessioned
+                                                                        or (FilePage.fileMetadata.datasetVersion.deaccessioned and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)))}"/>
             <ui:define name="meta_header">
             <meta name="description" content="#{FilePage.fileMetadata.description}"/>
             </ui:define>
             <ui:define name="body">
                 <f:metadata>
-                    <f:viewParam name="fileId" value="#{FilePage.fileId}"/>
+                    <o:viewParam name="fileId" value="#{FilePage.fileId}"/>
                     <f:viewParam name="version" value="#{FilePage.version}"/>
                     <f:viewParam name="persistentId" value="#{FilePage.persistentId}"/>
                     <f:viewParam name="datasetVersionId" value="#{FilePage.datasetVersionId}"/>
                     <f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
-                    <f:viewAction action="#{FilePage.init}" />
+                    <f:viewAction action="#{FilePage.init}"/>
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbsForFileMetadata(FilePage.fileMetadata)}"/>
                 </f:metadata>
                 <h:form id="fileForm">
                     <!-- Top Button/Citation Blocks -->
-                    <div class="row">
+                    <div id="fileVersionBlock" class="row">
                         <div class="col-xs-12">
-                            <div id="actionButtonBlock" class="col-xs-12 button-block">
-                                <div class="row">
-                                    <!-- ActionButtonBlock -->
-                                    <div class="col-xs-12 text-right padding-none">
-                                        <!-- Contact/Share Button Group -->
-                                        <div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                            <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
-                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                            </p:commandLink>
-                                            <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
-                                                           title="#{bundle['dataset.share.datasetShare']}"
-                                                           oncomplete="PF('shareDialog').show();sharrre();">
-                                                <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                            </p:commandLink>
+                            <div class="row">
+                                <div id="file-title-block" class="col-xs-12 margin-bottom-half">
+                                    <span class="file-title-label">#{FilePage.fileMetadata.label}</span>
+
+                                    <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.ingestProblem and FilePage.canUpdateDataset()}">
+                                        <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
+                                        <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="bottom" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{FilePage.fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
+                                            <span class="glyphicon glyphicon-warning-sign text-danger"/>
+                                        </span>
+                                    </ui:fragment>
+
+                                    <p class="help-block">
+                                        <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
+                                            <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
+                                        </h:outputFormat>
+                                    </p>
+
+                                    <div id="title-label-block" class="margin-top-half">
+                                        <!-- Restricted File Icon -->
+                                        <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}"/>
+                                        <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }"/>
+                                        <!-- DATASET Publication Status -->
+                                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
+                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
+                                        <!-- DATASET VERSION NUMBER -->
+                                        <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}"/> 
+                                        <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- START: NEW RESPONSIVE ABOVE FOLD BLOCK -->
+                            <div class="row">
+                                <!-- CITATION BLOCK -->
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9">
+                                    <!-- FILE CITATION -->
+                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
+                                    <div class="citation-block">
+                                        <div class="clearfix #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
+                                            <div class="citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}">
+                                                <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                                                    <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true) : FilePage.fileMetadata.getFileCitation(true)}" escape="false"/>
+                                                </span>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                            </div>
+                                            <div class="pull-left row col-sm-8 padding-none">
+                                                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                         #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu">
+                                                        <li>
+                                                            <a jsf:id="endNoteLink-2" jsf:action="#{FilePage.fileDownloadService.downloadCitationXML(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" >
+                                                                #{bundle['dataset.cite.downloadBtn.xml']}
+                                                            </a>
+                                                        </li>
+                                                        <li>
+                                                            <a jsf:id="risLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationRIS(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}">
+                                                                #{bundle['dataset.cite.downloadBtn.ris']}
+                                                            </a>
+                                                        </li>
+                                                        <li>
+                                                            <a jsf:id="bibLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationBibtex(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" target="_blank">
+                                                                #{bundle['dataset.cite.downloadBtn.bib']}
+                                                            </a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
+                                                </div>
+                                            </div>
                                         </div>
-                                        <!-- END: Contact/Share Button Group -->
-                                        <!-- 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
-                                                                     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']}
-                                                </p:commandLink>
+                                    </div>
+                                    <!-- END: FILE CITATION -->
+
+                                    <!-- DATASET CITATION -->
+                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
+                                    <div class="citation-block no-margin-bottom">
+                                        <div class="clearfix #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
+                                            <div class="citation #{FilePage.fileMetadata.datasetVersion.deaccessioned ? '' : 'margin-bottom'}">
+                                                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
+                                                    <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true)}" escape="false"/>
+                                                </span>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
+                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
+                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
+                                            </div>
+                                            <div class="pull-left row col-sm-8 padding-none">
+                                                <div class="col-sm-3 col-md-4 col-lg-3 btn-group margin-bottom citation-download" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu">
+                                                        <li>
+                                                            <a jsf:id="endNoteLink" jsf:action="#{FilePage.fileDownloadService.downloadDatasetCitationXML(FilePage.fileMetadata.datasetVersion.dataset)}" >
+                                                                #{bundle['dataset.cite.downloadBtn.xml']}
+                                                            </a>
+                                                        </li>
+                                                        <li>
+                                                            <a jsf:id="risLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationRIS(FilePage.fileMetadata.datasetVersion.dataset)}">
+                                                                #{bundle['dataset.cite.downloadBtn.ris']}
+                                                            </a>
+                                                        </li>
+                                                        <li>
+                                                            <a jsf:id="bibLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationBibtex(FilePage.fileMetadata.datasetVersion.dataset)}" target="_blank">
+                                                                #{bundle['dataset.cite.downloadBtn.bib']}
+                                                            </a>
+                                                        </li>
+                                                    </ul>
+                                                </div>
+                                                <div class="col-sm-9 col-md-8 col-lg-9 text-muted margin-bottom citation-standards" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                                    <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!-- END: DATASET CITATION -->
+                                </div>
+                                <!-- END: CITATION BLOCK -->
+
+                                <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom">
+                                    <!-- ActionButtonBlock -->
+                                    <div id="actionButtonBlock">
+                                            <!-- DOWNLOAD/ACCESS DATASET -->
+                                            <div class="btn-group btn-group-justified" 
+                                                 jsf:rendered="#{showAccessFileButtonGroup}">
+                                                <div class="btn-group">
+                                                    <button type="button" class="btn btn-primary btn-access-file dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        #{bundle['file.accessBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left">
+                                                        <!-- Explore/Download/Request Button Block -->
+                                                        <ui:fragment rendered="#{!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="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>
+                                                        </ui:fragment>
+                                                        <!-- END: Explore/Download/Request Button Block -->
+                                                    </ul>
+                                                </div>
                                             </div>
-                                            <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))}">
-                                                <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']} 
+
+                                            <!-- Edit/Map Button Block -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
+
+                                                <!-- Edit Button Group -->
+                                                <div class="btn-group" 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 btn-edit" onclick="PF('fileAlreadyReplacedPrevious').show()"
+                                                                   title="#{bundle['file.editBtn']}">
+                                                        #{bundle['file.editBtn']}
+                                                    </p:commandLink>
+                                                </div>
+                                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                         and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                                         and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
+                                                    <button type="button" id="editFile" class="btn btn-default btn-access btn-edit dropdown-toggle #{FilePage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                                                            disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
+                                                        #{bundle['file.editBtn']} <span class="caret"></span>
+                                                    </button>
+                                                    <ul class="dropdown-menu pull-right text-left">
+
+                                                        <!-- 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="isFilePg" value="true"/>
+                                                                <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 -->
+
+                                                        <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
+                                                            <li class="#{FilePage.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']}"/>
+                                                                    </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.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>
-                                                        </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}">
+                                                        <!-- end replace file link --></li>
+                                                        </ui:fragment>
+
+                                                        <!-- TO-DO #3488 ADD EDIT FILE TAGS LINK -->
+                                                        <ui:fragment rendered="#{false}">
                                                             <li>
-                                                                <p:commandLink onclick="PF('accessPopup').show()">
-                                                                    <h:outputText value="#{bundle['file.restrict']}"/>
+                                                                <p:commandLink onclick="PF('fileTagsPopup').show()"><!-- TODO #3488 ADD EDIT FILE TAGS POPUP -->
+                                                                    <h:outputText value="#{bundle['file.tags']}"/>
                                                                 </p:commandLink>
                                                             </li>
                                                         </ui:fragment>
-                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
+                                                        <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}"> 
-                                                        <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>
+                                                <!-- END: Edit Button Group -->
+
                                             </div>
-                                            <!-- END: Edit Button Group -->
-                                        </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 -->
+                                            <!-- END: Map/Edit Button Block -->
+
+                                            <!-- Contact/Share Button Group -->
+                                            <div class="btn-group btn-group-justified" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                                <p:commandLink class="btn btn-default btn-xs btn-contact" title="#{bundle['dataset.email.datasetContactTitle']}"
+                                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
+                                                    #{bundle['file.contactBtn']}
+                                                </p:commandLink>
+                                                <p:commandLink styleClass="btn btn-default btn-xs btn-share" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                                               title="#{bundle['file.share.fileShare']}"
+                                                               oncomplete="PF('shareDialog').show();sharrre();">
+                                                    #{bundle['file.shareBtn']}
+                                                </p:commandLink>
+                                            </div>
+                                            <!-- END: Contact/Share Button Group -->
                                     </div>
                                     <!-- END: ActionButtonBlock -->
                                 </div>
-                            </div>
-                            <div id="fileVersionBlock" class="row">
-                                <div id="fileImageTitle" class="col-xs-12">
-                                    <div id="file-title-block" class="row margin-bottom-half">
-                                        <div class="col-xs-12">
-                                            <!-- Restricted File Icon -->
-                                            <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
-                                            <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
-
-                                            <!-- Title/Label -->
-                                            <h:outputText value="#{FilePage.fileMetadata.label}" styleClass="file-title-label"/>
 
-                                            <div id="title-label-block" class="margin-top-half">
-                                                <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
-                                                <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
-                                                <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
-                                                <!-- DATASET VERSION NUMBER -->
-                                                <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
-                                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
-                                                <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
-                                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
-                                            </div>
+                                <div class="col-xs-12 col-sm-12 col-md-4 col-lg-3 pull-right margin-bottom" 
+                                     jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
+                                    <!-- Metrics -->
+                                    <div id="metrics-block">
+                                        <div id="metrics-heading">
+                                            #{bundle['metrics.file.title']}
+                                            <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
+                                                    data-trigger="hover" data-original-title="#{bundle['metrics.file.tip.default']}"></span>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top" 
+                                                    data-trigger="focus" data-html="true" data-content="#{bundle['metrics.file.tip.makedatacount']}"></a>
+                                            </ui:fragment>
                                         </div>
-                                    </div>
-                                    <div class="row">
-                                        <!-- CITATION BLOCK -->
-                                        <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-sm-12' : 'col-sm-9'}">
-                                            <div class="row">
-                                                <!-- FILE CITATION -->
-                                                <div class="col-sm-12">
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
-                                                </div>
-                                                <div class="col-sm-12 citation-block">
-                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
-                                                        <div class="row">
-                                                            <div class="col-sm-12 citation">
-                                                                <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                                                                    <h:outputText value="#{FilePage.fileMetadata.dataFile.isIdentifierRegistered() ? FilePage.fileMetadata.getDirectFileCitation(true) : FilePage.fileMetadata.getFileCitation(true)}" escape="false"/>
-                                                                </span>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                                                            </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['file.cite.file.downloadBtn']} <span class="caret"></span>
-                                                                    </button>
-                                                                    <ul class="dropdown-menu" role="menu">
-                                                                        <li>
-                                                                            <a jsf:id="endNoteLink-2" jsf:action="#{FilePage.fileDownloadService.downloadCitationXML(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" >
-                                                                                #{bundle['dataset.cite.downloadBtn.xml']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="risLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationRIS(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}">
-                                                                                #{bundle['dataset.cite.downloadBtn.ris']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="bibLink-2" jsf:actionListener="#{FilePage.fileDownloadService.downloadCitationBibtex(FilePage.fileMetadata, null, FilePage.fileMetadata.dataFile.isIdentifierRegistered())}" target="_blank">
-                                                                                #{bundle['dataset.cite.downloadBtn.bib']}
-                                                                            </a>
-                                                                        </li>
-                                                                    </ul>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <!-- END FILE CITATION -->
-                                                <!-- DATASET CITATION -->
-                                                <div class="col-sm-12">
-                                                    <p class="help-block">
-                                                        <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
-                                                            <o:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
-                                                        </h:outputFormat>
-                                                    </p>
-                                                    <h:outputFormat styleClass="h5" value="#{bundle['file.citation.dataset']}" escape="false" />
-                                                </div>
-                                                <div class="col-sm-12 citation-block no-margin-bottom">
-                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
-                                                        <div class="row">
-                                                            <div class="col-sm-12 citation">
-                                                                <span class="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                                                                    <h:outputText value="#{FilePage.fileMetadata.datasetVersion.getCitation(true)}" escape="false"/>
-                                                                </span>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>
-                                                                <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
-                                                                      data-toggle="tooltip" data-placement="top" data-original-title="#{bundle['dataset.cite.title.deassessioned']}"/>
-                                                            </div>
-                                                            <div class="col-sm-6 citation-download vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <div class="dropdown">
-                                                                    <button type="button" class="btn btn-default dropdown-toggle downloadCitation" data-toggle="dropdown">
-                                                                        <span class="glyphicon glyphicon-list"/> #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
-                                                                    </button>
-                                                                    <ul class="dropdown-menu" role="menu">
-                                                                        <li>
-                                                                            <a jsf:id="endNoteLink" jsf:action="#{FilePage.fileDownloadService.downloadDatasetCitationXML(FilePage.fileMetadata.datasetVersion.dataset)}" >
-                                                                                #{bundle['dataset.cite.downloadBtn.xml']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="risLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationRIS(FilePage.fileMetadata.datasetVersion.dataset)}">
-                                                                                #{bundle['dataset.cite.downloadBtn.ris']}
-                                                                            </a>
-                                                                        </li>
-                                                                        <li>
-                                                                            <a jsf:id="bibLink" jsf:actionListener="#{FilePage.fileDownloadService.downloadDatasetCitationBibtex(FilePage.fileMetadata.datasetVersion.dataset)}" target="_blank">
-                                                                                #{bundle['dataset.cite.downloadBtn.bib']}
-                                                                            </a>
-                                                                        </li>
-                                                                    </ul>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                                <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
+                                        <div id="metrics-body">
+                                            <!-- Classic downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                      data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
                                             </div>
-                                        </div>
-                                        <!-- END DATASET CITATION -->
-                                        <!-- Metrics -->
-                                        <div class="col-sm-3">
-                                            <div id="metrics-block" jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
-                                                <div id="metrics-heading">
-                                                    #{bundle['metrics.file.title']}
-                                                    <ui:fragment rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                            data-trigger="hover" data-original-title="#{bundle['metrics.file.tip.default']}"></span>
-                                                    </ui:fragment>
-                                                    <ui:fragment rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="popover" data-placement="auto top" 
-                                                            data-trigger="focus" data-html="true" data-content="#{bundle['metrics.file.tip.makedatacount']}"></a>
-                                                    </ui:fragment>
-                                                </div>
-                                                <div id="metrics-body">
-                                                    <!-- Classic downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                            <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
-                                                        </h:outputFormat>
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
-                                                    </div>
-                                                    <!-- Make Data Count downloads -->
-                                                    <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                                        <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                            <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
-                                                        </h:outputFormat>
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
-                                                    </div>
-                                                </div>
+                                            <!-- Make Data Count downloads -->
+                                            <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                    <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileId)}"/>
+                                                </h:outputFormat>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                        data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.file.downloads.tip']}"></span>
                                             </div>
                                         </div>
-                                        <!-- END: Metrics -->
                                     </div>
-                                    <!-- DEACCESSION REASON -->
-                                    <div class="row" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                        <div id="deaccession-reason-block" class="col-xs-12">
-                                            <div class="col-xs-12 bg-danger">
-                                                <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                                <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
-                                                <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
-                                                    <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
-                                                </ui:fragment>
-                                            </div>
-                                        </div>
+                                    <!-- END: Metrics -->
+                                </div>
+
+                                <!-- DEACCESSION ONLY?? NO SUMMARY BLOCK?? RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
+                                <div jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
+                                     id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
+                                <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+
+                                <!-- DEACCESSION REASON -->
+                                <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                    <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
+                                        <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
+                                        <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
+                                        <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
+                                            <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
+                                        </ui:fragment>
                                     </div>
-                                    <!-- END DEACCESSION REASON -->
                                 </div>
+                                <!-- END DEACCESSION REASON -->
                             </div>
+                            <!-- END: NEW RESPONSIVE ABOVE FOLD BLOCK -->
                         </div>
                     </div>
                     <!-- END Top Button/Citation Blocks -->
@@ -367,7 +394,7 @@
                                     <ui:param name="fileMetadata" value="#{fileMetadata}"/>
                                     <ui:param name="datasetVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
                                     <!--  Should be FilePage.fileDownloadService ? -->
-                                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                                    <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                                 </ui:include>
                             </p:tab>
                             <p:tab id="previewTab" title="#{bundle['file.previewTab.header']}" 
@@ -455,26 +482,28 @@
                                 <!-- Metadata -->
                                 <div class="button-block tab-header margin-bottom text-right">
                                     <!-- Add + Edit Metadata Button -->
-                                    <h:outputLink styleClass="btn btn-default btn-access #{(FilePage.lockedFromEdits) ? 'disabled' : ''}"
+                                    <h:outputLink styleClass="btn btn-default btn-access #{FilePage.lockedFromEdits ? 'disabled' : ''}"
                                                   value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE"
                                                   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)))}"
-                                                  disabled="#{FilePage.lockedFromEdits}">
+                                                  disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
                                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                     </h:outputLink>
                                     <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)))}">
-                                        <button class="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()" type="button" disabled="#{FilePage.lockedFromEdits}">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
+                                        <button class="btn btn-default btn-access #{FilePage.lockedFromEdits ? 'disabled' : ''}" onclick="PF('fileAlreadyReplacedPrevious').show()" type="button"
+                                                disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
                                         </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" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/></button>
-                                        <ul class="dropdown-menu" role="menu">
+                                            <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{FilePage.getExporters()}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
@@ -632,9 +661,9 @@
                         </p:tabView>
                     </div>
                     <!-- POPUPS -->
-                    <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>
+                    <p:dialog id="shareDialog" header="#{bundle['file.share.title']}" widgetVar="shareDialog" modal="true" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                        <p class="help-block">#{bundle['file.share.tip']}</p>
+                        <div id="sharrre-widget" data-text="#{bundle['file.share.text']}" data-url="#{systemConfig.dataverseSiteUrl}/file.xhtml?#{empty FilePage.fileMetadata.dataFile.globalIdString ? 'fileId' : 'persistentId'}=#{empty FilePage.fileMetadata.dataFile.globalIdString ? FilePage.fileMetadata.dataFile.id : FilePage.fileMetadata.dataFile.globalIdString}&amp;version=#{FilePage.fileMetadata.datasetVersion.friendlyVersionNumber}"></div>
                         <div class="button-block">
                             <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
                                 #{bundle.close}
@@ -681,6 +710,16 @@
                             <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
+                    <p:dialog id="mapDataDialog" header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapDataDialog" modal="true">
+                        <p class="help-block">
+                            <span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
+                        </p>
+                        <div class="button-block">
+                            <button type="button" class="btn btn-default" onclick="PF('mapDataDialog').hide();PF('blockDatasetForm').hide();">
+                                #{bundle.close}
+                            </button>
+                        </div>
+                    </p:dialog>
                     <p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.getDisplayNameLang()}" widgetVar="configureToolPopup" modal="true"
                                 rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
                         <ui:include src="file-configure-popup-fragment.xhtml">
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 9ac4f4890df..ad61e1f50cd 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -132,11 +132,11 @@
 
                             <!-- 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' : ''}"
+                                          type="button" styleClass="btn btn-default btn-access #{DatasetPage.lockedFromEdits ? 'disabled' : ''}"
                                           disabled="#{DatasetPage.lockedFromEdits}" rendered="#{DatasetPage.sessionUserAuthenticated 
                                                                                         and DatasetPage.canUpdateDataset()
                                                                                         and !widgetWrapper.widgetView}">
-                                <span class="glyphicon #{DatasetPage.lockedFromEdits ? 'glyphicon-ban-circle' : 'glyphicon-plus'}"/> <h:outputText id="uploadFile-s-Link" value="#{bundle['file.uploadFiles']}"/>
+                                <span class="glyphicon glyphicon-plus"/> <h:outputText id="uploadFile-s-Link" value="#{bundle['file.uploadFiles']}"/>
                             </h:outputLink>
                         </div>
                     </p:outputPanel>
@@ -529,7 +529,7 @@
                                     and DatasetPage.workingVersion.fileMetadatas.size() > 1) and DatasetPage.downloadButtonAvailable
                                     and DatasetPage.isHasTabular()}">
                         <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">  
-                            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"/>
+                            <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"></span>
                         </button>
                         <ul jsf:id="downloadDropdownOptions" class="dropdown-menu multi-level pull-right text-left" role="menu">
                             <li >
@@ -577,35 +577,8 @@
                                 disabled="#{DatasetPage.locked}">
                     <span class="glyphicon glyphicon-bullhorn"/> #{bundle['file.requestAccess']}
                 </p:commandLink>
-            </f:facet>          
-            <div id="txtInprogess" class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
-                <!-- Ingest in progress... -->
-                #{bundle['file.ingestInProgress']}
-            </div>
+            </f:facet>
             
-            <!---Modular configure-->
-            <ui:fragment rendered="#{!widgetWrapper.widgetView and DatasetPage.sessionUserAuthenticated and DatasetPage.canUpdateDataset() and (DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id).size() > 0 or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
-                <ui:include src="file-configure-dropdown-fragment.xhtml">
-                    <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                    <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
-                    <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                </ui:include>
-            </ui:fragment>
-
-            <div class="btn-group" jsf:rendered="#{!fileMetadata.dataFile.filePackage or
-                fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
-                <ui:include src="file-download-button-fragment.xhtml">
-                    <ui:param name="fileMetadata" value="#{fileMetadata}"/>
-                    <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
-                    <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
-                    <ui:param name="requestAccessPopupRequired" value="#{DatasetPage.requestAccessPopupRequired}"/>
-                    <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
-                    <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
-                    <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
-                    <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
-                    <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile.id)}"/>
-                </ui:include>
-            </div>
             <div class="col-xs-12 text-left small" jsf:rendered="#{fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload 
                 and !DatasetPage.workingVersion.getDataset().getStorageIdentifier().startsWith('s3://') 
                 }">
@@ -616,6 +589,56 @@
                     <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                 </ui:include>
             </div>
+            
+            <!-- FILE LEVEL INLINE INDICATORS, MSG, ICON, ET AL -->
+            <div id="txtInprogess" class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{fileMetadata.dataFile.ingestInProgress}">
+                <!-- Ingest in progress... -->
+                #{bundle['file.ingestInProgress']}
+            </div>
+            <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and DatasetPage.canUpdateDataset()}">
+                <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
+                <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
+                    <span class="glyphicon glyphicon-warning-sign text-danger"/>
+                </span>
+            </ui:fragment>
+            <!-- END: FILE LEVEL INLINE INDICATORS, MSG, ICON, ET AL -->
+            
+            
+            <div class="btn-group" role="group" aria-label="TODO: ACCESSIBILITY LABEL FILE LEVEL ACTIONS">
+            
+                <!---Modular configure-->
+                <ui:fragment rendered="#{!widgetWrapper.widgetView 
+                                         and DatasetPage.sessionUserAuthenticated 
+                                         and DatasetPage.canUpdateDataset() 
+                                         and (DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id).size() > 0 
+                                                or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) 
+                                                or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
+                    <ui:include src="file-configure-dropdown-fragment.xhtml">
+                        <ui:param name="configureTools" value="#{DatasetPage.getConfigureToolsForDataFile(fileMetadata.dataFile.id)}"/>
+                        <ui:param name="isFilePg" value="false"/>
+                        <ui:param name="fileId" value="#{fileMetadata.dataFile.id}"/>
+                        <ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>
+                    </ui:include>
+                </ui:fragment>
+
+                <ui:fragment rendered="#{!fileMetadata.dataFile.filePackage or
+                    fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload}">
+
+                    <ui:include src="file-download-button-fragment.xhtml">
+                        <ui:param name="fileMetadata" value="#{fileMetadata}"/>
+
+                        <ui:param name="downloadPopupRequired" value="#{DatasetPage.downloadPopupRequired}"/>
+                        <ui:param name="requestAccessPopupRequired" value="#{DatasetPage.requestAccessPopupRequired}"/>
+                        <ui:param name="guestbookResponse" value="#{DatasetPage.guestbookResponse}"/>
+                        <ui:param name="guestbookResponseService" value="#{DatasetPage.guestbookResponseService}"/>
+                        <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
+                        <ui:param name="lockedFromDownload" value="#{DatasetPage.lockedFromDownload}"/>
+                        <ui:param name="exploreTools" value="#{DatasetPage.getExploreToolsForDataFile(fileMetadata.dataFile.id)}"/>
+                    </ui:include>
+                </ui:fragment>
+            
+            </div>
+            
         </p:column>
     </p:dataTable>
     
diff --git a/src/main/webapp/iframe.xhtml b/src/main/webapp/iframe.xhtml
index 735de3bc23d..1c5c1397ed2 100644
--- a/src/main/webapp/iframe.xhtml
+++ b/src/main/webapp/iframe.xhtml
@@ -59,7 +59,7 @@
             //]]>
         </script>
     </h:head>
-    <h:body>
+    <h:body styleClass="widget-view">
         <f:loadBundle basename="propertyFiles.Bundle" var="bundle"/>
         <f:metadata>
             <f:viewParam name="persistentId" value="#{DatasetPage.persistentId}"/>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index f8a6de995f8..936cdf5f1e6 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -8,12 +8,14 @@ body {
   /* Sticky footer Margin bottom by footer height */
   margin-bottom:160px;
 }
-body.widget-view {margin-bottom:54px;}
+body.widget-view {margin-bottom:44px;}
 body .ui-widget {font-size: inherit;}
 .ui-widget-content a {color: #337AB7;}
 .ui-widget-content a:hover, .ui-widget-content a:focus {color: #23527C;}
 
 /* -------- TEMPLATE -------- */
+/* TODO FIX DROPDOWN MENU LAYERED UNDER FOOTER */
+#content {padding-bottom:0px;}
 .panelgridHeaderTable {width:100%;}
 .panelgridHeaderTable .ui-widget-content, .panelgridHeaderTable .ui-widget-content > td {border:0; background:none;}
 .panelgridHeaderTable .ui-widget-content > td:last-child table {margin-left:auto;}
@@ -61,8 +63,8 @@ body .ui-widget {font-size: inherit;}
 #status-alert {margin-top:0; margin-bottom:0;}
 #status-alert div.alert {border:0; box-shadow:none;}
 
-#footer {position:absolute; bottom:0; margin-top:3em; padding-bottom:100px; width:100%; height:60px; color:#808080;}
-#footer.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; background:#fff;}
+#footer {position:absolute; bottom:0; width:100%; height:60px; padding-bottom:100px; color:#808080;}
+#footer.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; height:auto; background:#fff;}
 #footer .poweredbylogo {text-align:right;}
 #footer .poweredbylogo span {font-size:.85em;margin-right:.3em;}
 #footer .version {vertical-align:bottom;white-space:nowrap;}
@@ -90,6 +92,8 @@ body .ui-widget {font-size: inherit;}
 .panelLayoutBlock .ui-panelgrid.panelgridLayoutTable .ui-widget-content .ui-panelgrid .ui-widget-content .ui-panelgrid td:first-child {padding-left:0;}
 
 .btn span.glyphicon {margin-right:.3em;}
+.btn.btn-link.bootstrap-button-tooltip span.glyphicon {margin:0;} /* OR JUST USE NO-TEXT... */
+.btn.btn-link.bootstrap-button-tooltip span.caret {margin-left:6px;}
 .btn span.glyphicon.no-text {margin:0;}
 .btn-group .btn span.glyphicon.no-text {margin-left:10px;margin-right:10px;}
 .col-manage-action .btn-group .btn span.glyphicon.no-text {margin:0;}
@@ -112,6 +116,15 @@ tr.ui-state-highlight .ui-icon {
 }
 td.col-select-width, th.col-select-width {width:36px;}
 
+/* FILE TABLE ROW SELECTED ICON BTN COLOR PF HACK */
+.ui-state-highlight a.btn-link, .ui-widget-content .ui-state-highlight a.btn-link, .ui-widget-header .ui-state-highlight a.btn-link {
+    color: #337AB7;
+}
+.ui-state-highlight a.btn-link:focus, .ui-widget-content .ui-state-highlight a.btn-link:focus, .ui-widget-header .ui-state-highlight a.btn-link:focus, 
+.ui-state-highlight a.btn-link:hover, .ui-widget-content .ui-state-highlight a.btn-link:hover, .ui-widget-header .ui-state-highlight a.btn-link:hover {
+    color: #23527C;
+}
+
 #ajaxStatusPanel_start {width:31px;height:31px;position:fixed;right:50%;bottom:50%;z-index:111111;}
 #ajaxStatusPanel_complete {position:absolute;top:-9999px;left:-9999px;}
 
@@ -367,7 +380,7 @@ table.ui-selectmanycheckbox.metadata-blocks-select label.ui-state-disabled {back
 div.ui-state-focus span.ui-chkbox-icon {outline: -webkit-focus-ring-color auto 5px;}
 
 /* Buttons */
-#actionButtonBlock {margin-bottom:1em; margin-top:0;}
+#actionButtonBlock {/*margin-bottom:1em; margin-top:0;*/}
 #dataverse-info-dropdown {padding:.5em 1em .25em 1em; overflow:hidden; width:400px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon {width:40px; float:left; margin-right:12px;}
 #dataverse-info-dropdown .dataverse-info-logo-icon .icon-dataverse {font-size:40px; line-height:40px;}
@@ -380,9 +393,8 @@ td.col-file-action > .button-block, .col-manage-action > .button-block,
 div.ui-datatable-header > .button-block, .button-block.tab-header, #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
 th.col-file-action.text-right {text-align: right;}
 form.btn-form {display:inline-block;}
-.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block span.btn.ui-state-disabled, .button-block .button-container {margin-right:1em;}
-
-td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margin-left:.5em;}
+.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block .button-container,
+.button-block span.btn.ui-state-disabled, .button-block span.btn.disabled {margin-right:1em;}
 
 .btn.btn-default.btn-access {background-color: #fff;background-image:none;}
 .btn.btn-default.btn-access:focus, .btn.btn-default.btn-access:hover,.btn.btn-default.btn-access:active {background-color: #e6e6e6;background-image:none;}
@@ -396,7 +408,14 @@ td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margi
 .button-block span.ui-state-disabled:last-child, .button-block.pull-right .btn:last-child, 
 .button-block .btn:only-child, .button-block div.btn-group:only-child {margin-right:0;}
 
-.button-block ul.dropdown-menu li.disabled span.ui-commandlink.ui-state-disabled {display: block; padding: 3px 20px; color: #777; background: none; opacity:1.0;}
+/* DIASABLED LINK-BTN TITLE PF COMMANDLINK HACK */
+/* TODO - REVIEW DISABLED CLASS LINKS WHICH 
+          ARE NOW FUNCTIONAL DUE TO HACK?? 
+          "This class uses pointer-events: none to try to disable the link functionality"
+html .ui-state-disabled {
+    pointer-events: all;
+} */
+div.btn-group ul.dropdown-menu li.disabled span.ui-commandlink.ui-state-disabled {display: block; padding: 3px 20px; color: #777; background: none; opacity:1.0;}
 .button-single {display: block; padding: 3px 3px; color: #777; background: none; opacity:1.0;}
 div.field-add-delete a.btn {margin:0 1em 0 0;}
 div.field-add-delete a.btn:last-child {margin-right:0;}
@@ -433,10 +452,7 @@ a[id$='advsearchlink'] {margin-left:1em;}
 #dv-main {}
 #dv-main.nofacets {width:100%;float:none;}
 
-/*
- * Off Canvas
- * --------------------------------------------------
- */
+/* Off Canvas */
 @media screen and (max-width: 767px) {
   .row-offcanvas {
     position: relative;
@@ -493,11 +509,6 @@ span.search-term-match {font-weight: bold;}
 [id$='resultsTable'] div.card-preview-icon-block span[class^='icon'],
 [id$='resultsTable'] div.card-preview-icon-block span[class^='glyphicon'] {font-size:2.8em;}
 
-[id$='title-block'] div[class^='col'].vcenter {display:inline-block; vertical-align:middle; float:none; /*-- padding:0; --*/}
-[id$='title-block'] div.title-preview-icon-block {width:48px; font-size:110%; color:#428BCA;}
-[id$='title-block'] div.title-preview-icon-block img {margin:6px 0;}
-[id$='title-block'] div.title-preview-icon-block span[class^='icon'] {font-size:2.8em;}
-
 form[id$='facetType'] > div.clearfix {margin-bottom:4px;}
 form[id$='facetType'] > div.clearfix:last-child {margin-bottom:0;}
 form[id$='facetType'] > div.clearfix .facetTypeChBox {display:block; float:left;}
@@ -582,23 +593,21 @@ div.popupSubTabParent > div.ui-tabs-panels > div.ui-tabs-panel.ui-widget-content
 div.ui-tabs-panels .ui-tabs .ui-tabs-nav.ui-widget-header li {border:0;}
 div.ui-tabs-panels .ui-tabs.ui-tabs-top .ui-tabs-nav.ui-widget-header {border-bottom:0;}
 
-/* -------- ADVANCED -------- */
-
 /* -------- PERMISSIONS -------- */
 div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:inline-block; margin-bottom:4px;}
 
 /* -------- METRICS -------- */
-#metrics-block {margin-bottom:20px;}
+#metrics-block {/*margin-bottom:20px;*/}
 
 /* -- OLD LAYOUT -- */
-#metrics-block {border:1px solid #eee; padding:0;}
+#metrics-block1 {border:1px solid #eee; padding:0;}
 #metrics-label {color:#333;background:#eee;padding:8px 10px;}
 #metrics-label a {color:#333;display:block;}
 #metrics-label a:hover {text-decoration:none;}
 #metrics-content {color:#333;background:#fff;padding:8px 10px;}
-
-#metrics-heading {font-weight:bold;color:#333;background:#eee;padding:8px 10px;}
-#metrics-body {border:1px solid #EEE;border-top-width:0;padding:8px 10px;}
+/* -- NEW LAYOUT -- */
+#metrics-block {border:0; margin-top:6px;}
+#metrics-body {border:1px solid #EEE;border-width:1px 0 0 0;padding:8px 0;}
 #metrics-block .metrics-count-block:not(:last-child) {margin-bottom:.5em;padding-bottom:.5em;border-bottom:1px solid #EEE}
 
 /* -------- SHARRRE -------- */
@@ -616,30 +625,40 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #datasetVersionBlock span.label {vertical-align:text-top; line-height:normal; margin-left: .5em;}
 #title-label-block span:first-of-type {margin-left:0 !important;}
 
-#title {font-size:1.5em;font-weight:bold;}
+#title {font-size:36px !important;line-height:1.1;font-weight:bold;}
 #author, #contact {display:block; margin-bottom:.5em;}
-.citation-block {/*-- margin-bottom:.5em; padding-right:0; --*/}
-.bg-citation {background:#ECF6FB;}
-.bg-citation-file {background:#f5f5f5; border: 1px solid #DDD;}
-.alert-danger.bg-danger {background:#F2DEDE;}
-div.alert-info.bg-citation, div.alert-danger.bg-danger {padding-top:4px; padding-bottom:4px; border-radius:0; color:#333;}
-.citation-block > div.alert-info.bg-citation, .citation-block > div.alert-danger.bg-danger {padding-top:0; padding-bottom:0;}
-.citation-select {/*-- display:inline-block; --*/}
-.citation, .citation-download, .citation-standards {padding:.5em;}
+
+/* RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 */
+#dataset-colorder-block {height: 50px;}
+@media(min-width:992px){
+    #dataset-summary-metadata, #deaccession-reason-block {margin-top: -50px;}
+}
+
+.bg-citation {background:#ECF6FB; border: 0;}
+#iframeForm div.alert.bg-citation {margin-bottom:0 !important;}
+.bg-citation-file {background:#f5f5f5; border: 0;}
+.alert-danger.bg-danger {background:#F2DEDE; border: 0;}
+div.alert-info.bg-citation, div.alert-danger.bg-danger {border-radius:0; color:#333;}
 .citation span.glyphicon-question-sign {margin-left:.5em; margin-bottom:2px; vertical-align: middle;}
-.citation-block .vcenter {display: inline-block; vertical-align: middle; float: none;}
-.waiver-CC0-inline {display:inline-block; margin-left:1em;}
+div.citation-block div.alert {padding:10px 10px 0px 10px;}
+div.citation-block div.preview-icon-block {padding-right:10px;padding-bottom:10px; min-height:140px;} /* min-height needed for colorder bootstrap layout hack */
+div.citation-block div.preview-icon-block img {max-width:140px; max-height:140px;}
+div.citation-block div.preview-icon-block span[class^='icon'] {font-size:7.5em; line-height:1.1; color:#428BCA;}
+@media(max-width:767px){
+    div.citation-block div.preview-icon-block img {max-width:100px; max-height:100px;}
+    div.citation-block div.preview-icon-block span[class^='icon'] {font-size:6em;}
+}
+div.citation-block div.citation span.citation-select a {word-break: break-all;}
+div.citation-block div.citation-download.margin-bottom {margin-bottom:10px;}
+div.citation-block div.citation-standards.margin-bottom {margin-bottom:10px;padding-top:1px;padding-bottom:1px;}
 
 div.panel-body div.form-group:last-child, div.panel-body div.form-group:last-child label {margin-bottom:0 !important;}
-div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
 
 /* Buttons */
 .button-block.form-top {border-top: 1px solid #dddddd; padding:1em 0;}
 span[id$='editDataSet'] .ui-button-text {white-space: nowrap;}
 #replicationDataButton {margin-top:5px;}
 
-#deaccession-reason-block {}
-
 div.form-group .glyphicon.glyphicon-asterisk {font-size:.5em; vertical-align:text-top;}
 #datasetForm .form-group, #templateForm .form-group {overflow: hidden;}
 div.form-col-container div.form-col-container {padding-left:0;}
@@ -710,15 +729,14 @@ div.panel-heading.text-info[data-toggle="collapse"] {color: #31708F;}
 
 .btn-sm.ui-button {padding: 5px 10px;}
 
-#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
-
 div.popover.thumb-preview.fade.top.in, div.popover.thumb-preview.fade.bottom.in {max-width: none;}
 div.popover.thumb-preview.fade.top.in div.popover-content, div.popover.thumb-preview.fade.bottom.in div.popover-content {text-align:center; vertical-align: middle; display:table-cell; width:428px; height:418px;}
 a.popoverHTML {display:inline-block;}
 
+/* TERMS */
+.waiver-CC0-inline {display:inline-block; margin-left:1em;}
 
-div[id$="versionsTable"] th.col-select-width * {display:none;}
-
+/* FILES */
 div[id$="filesTable"].ui-datatable.ui-widget div.ui-datatable-tablewrapper {overflow:visible;}
 div[id$="filesTable"].ui-datatable.ui-widget {margin-bottom:20px;}
 div[id$="filesTable"].ui-datatable.ui-widget table {table-layout: fixed;}
@@ -743,6 +761,7 @@ div[id$="filesTable"] div.file-tags-block span.label {display:inline-block;}
 div[id$="filesTable"] div.file-tags-block span.label, div[id$="filesTable"] div.file-tags-block a.ui-commandlink {margin-right:.5em;}
 div[id$="filesTable"] div.file-tags-block span.label:last-of-type {margin-right:0;}
 div[id$="filesTable"] td.col-file-action {padding-left:0; border-left:0;}
+div[id$="filesTable"] td.col-file-action .btn-group .btn-link {font-size:2em !important;}
 div[id$="filesTable"] td.col-file-access {width:50%;}
 div[id$="filesTable"] div.ui-datatable-header.ui-widget-header {padding:0 10px;}
 div[id$="filesHeaderBlock"] {margin-bottom:10px;}
@@ -816,8 +835,17 @@ div[id$="filesTable"] .ui-paginator .ui-paginator-pages .ui-state-active {
 /* FILES TREE */
 div[id$="filesTree"] span.ui-treenode-label span[class^='icon'] {margin-left: -2px;}
 
-span.ingest-warning {display:inline-block; font-size:24px; line-height:1; vertical-align: middle;}
-span.ingest-warning span.glyphicon {top:3px} 
+span.ingest-warning {font-size:2em !important; line-height:1; vertical-align: middle;}
+
+/* DOWNLOAD POPUP */
+div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; background-color:#eeeeee;}
+
+/* UPLOAD FILES */
+#dragdropMsg {padding:20px;font-size:1.3em;color:#808080;text-align:center;}
+.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
+
+/* VERSIONS */
+div[id$="versionsTable"] th.col-select-width * {display:none;}
 
 #version-details-block > div {width:35%; padding:4px 10px; border: 1px solid #DDDDDD;}
 #version-details-block > div:first-of-type {width:30%; border:0;}
@@ -834,15 +862,12 @@ div.dvnDifferanceTable div.ui-datatable-tablewrapper table td.versionDetails {wi
 
 div.dvnDifferanceTable .diffDetailBlock {display:block;}
 
-.dropin-btn-status.ui-icon {background: url("https://www.dropbox.com/static/images/widgets/dbx-saver-status.png") no-repeat;}
-
 /* MANAGE TABLE + DROPDOWN BUTTON */
 div.manageTable.ui-datatable div.ui-datatable-tablewrapper, div.manageTable.ui-datatable td.col-manage-action {overflow:visible;}
 div[id$="filesTable"].ui-datatable thead th.col-file-action, div[id$="filesTable"].ui-datatable tbody td.col-file-action {overflow:visible !important;}
 thead.ui-datatable-scrollable-theadclone {display:none}
 
 /* FILE */
-#fileImageTitle {margin-bottom: 12px;}
 #file-preview-icon-block > #border-block {/*border:1px solid #DDD;border-radius:4px; padding: 10px;*/}
 #file-preview-icon-block > #border-block > #preview-square {/*position: relative; overflow:hidden; padding-bottom:100%;*/}
 #file-preview-icon-block > #border-block > #preview-square > span.text-muted {font-size:6.5em; line-height:1 !important; /*text-align: center; position: absolute; width: 100%; height: 100%; margin:0;*/}
@@ -862,11 +887,13 @@ thead.ui-datatable-scrollable-theadclone {display:none}
         font-size: 17.5em;
     }
 }
-#fileImageTitle span.glyphicon-lock, #fileImageTitle span.icon-unlock {font-size:1.5em;}
-#fileImageTitle #file-title-block span.file-title-label {font-size:1.5em;font-weight:bold;margin-right:.5em;}
-#fileImageTitle #file-title-block span.label {margin-right:.5em;vertical-align: text-top;}
+
+#file-title-block span.file-title-label {font-size:36px !important;line-height:1.1;font-weight:bold;margin-right:.5em;}
+#file-title-block span.label {vertical-align: text-top;}
+#file-title-block span.label, #file-title-block span.glyphicon-lock, #file-title-block span.icon-unlock {margin-right:.5em;}
+#file-title-block span.glyphicon-lock, #file-title-block span.icon-unlock {top:1px;}
+#file-title-block span.ingest-warning {vertical-align:text-bottom;font-size:30px;}
 #fileCategoriesBlock span.label {margin-right: 0.5em;}
-#fileImageTitle #deaccession-reason-block.col-xs-12 {padding-left:15px;padding-right:15px;}
 
 /* BLOCK UI */
 .ui-blockui.ui-widget-overlay {background:#fff; opacity:.6;}
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 45ae157a8fc..5871de46983 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -518,8 +518,8 @@
                         </div>
                         <div class="card-preview-icon-block text-center">
                             <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">                               
-                                <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl}" alt="#{result.title}"/>                               
-                                <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl}"/>
+                                <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl and !result.deaccessionedState}" alt="#{result.title}"/>                               
+                                <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl or result.deaccessionedState}"/>
                             </a>
                         </div>
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
index c83afc1470c..79d2785b307 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -23,8 +23,11 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
 import static junit.framework.Assert.assertEquals;
 import static java.lang.Thread.sleep;
+import javax.imageio.ImageIO;
 import static javax.ws.rs.core.Response.Status.CREATED;
 import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static javax.ws.rs.core.Response.Status.OK;
@@ -32,6 +35,7 @@
 import org.hamcrest.Matchers;
 import org.junit.After;
 import static org.junit.Assert.assertNotEquals;
+import static java.lang.Thread.sleep;
 
 public class SearchIT {
 
@@ -429,6 +433,24 @@ public void testDatasetThumbnail() {
                 .contentType("image/png")
                 .statusCode(OK.getStatusCode());
 
+        String trueOrWidthInPixels = "true";
+        Response getFileThumbnailImageA = UtilIT.getFileThumbnail(dataFileId1.toString(), trueOrWidthInPixels, apiToken);
+        getFileThumbnailImageA.then().assertThat()
+                .contentType("image/png")
+                .statusCode(OK.getStatusCode());
+
+        try {
+            BufferedImage bufferedImage = ImageIO.read(getFileThumbnailImageA.body().asInputStream());
+            int width = bufferedImage.getWidth();
+            int height = bufferedImage.getHeight();
+            System.out.println("width: " + width);
+            System.out.println("height: " + height);
+            int expectedWidth = 64;
+            assertEquals(expectedWidth, width);
+        } catch (IOException ex) {
+            Logger.getLogger(SearchIT.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
         InputStream inputStream2creator = UtilIT.getInputStreamFromUnirest(thumbnailUrl, apiToken);
         assertEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream2creator));
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 9007cc6655a..ab9b9e05073 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -510,6 +510,14 @@ static Response updateDatasetPIDMetadata(String persistentId,  String apiToken)
                 .post("/api/datasets/:persistentId/modifyRegistrationMetadata/?persistentId=" + persistentId);
         return response;
     }
+    
+    static Response loadMetadataBlock(String apiToken, byte[] body) {
+        return given()
+          .header(API_TOKEN_HTTP_HEADER, apiToken)
+          .contentType("text/tab-separated-values; charset=utf-8")
+          .body(body)
+          .post("/api/admin/datasetfield/load");
+    }
 
     static private String getDatasetXml(String title, String author, String description) {
         String xmlIn = "<?xml version=\"1.0\"?>\n"
@@ -1395,12 +1403,13 @@ static Response getDatasetThumbnailMetadata(Integer datasetId, String apiToken)
                 .get("/api/admin/datasets/thumbnailMetadata/" + datasetId);
     }
 
-    static Response loadMetadataBlock(String apiToken, byte[] body) {
+    /**
+     * @param trueOrWidthInPixels Passing "true" will result in the default width in pixels (64).
+     */
+    static Response getFileThumbnail(String fileDatabaseId, String trueOrWidthInPixels, String apiToken) {
         return given()
-          .header(API_TOKEN_HTTP_HEADER, apiToken)
-          .contentType("text/tab-separated-values; charset=utf-8")
-          .body(body)
-          .post("/api/admin/datasetfield/load");
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/access/datafile/" + fileDatabaseId + "?imageThumb=" + trueOrWidthInPixels);
     }
 
     static Response useThumbnailFromDataFile(String datasetPersistentId, long dataFileId1, String apiToken) {
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
index bb19a32c4f8..bc63c94153f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataset/DatasetUtilTest.java
@@ -23,7 +23,7 @@ public class DatasetUtilTest {
      */
     @Test
     public void testGetThumbnailCandidates() {
-        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(null, false));
+        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(null, false, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
 
         Dataset dataset = MocksFactory.makeDataset();
         DataFile dataFile = MocksFactory.makeDataFile();
@@ -37,21 +37,21 @@ public void testGetThumbnailCandidates() {
         List<FileMetadata> fmds = new ArrayList<>();
         fmds.add(MocksFactory.addFileMetadata(dataFile));
         version.setFileMetadatas(fmds);
-        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(dataset, false));
+        assertEquals(new ArrayList<>(), DatasetUtil.getThumbnailCandidates(dataset, false, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test
     public void testGetThumbnailNullDataset() {
-        assertNull(DatasetUtil.getThumbnail(null));
-        assertNull(DatasetUtil.getThumbnail(null, null));
+        assertNull(DatasetUtil.getThumbnail(null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        assertNull(DatasetUtil.getThumbnail(null, null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
 
         Dataset dataset = MocksFactory.makeDataset();
         System.setProperty("dataverse.files.testfile.type", "file");
         dataset.setStorageIdentifier("testfile://");
         dataset.setUseGenericThumbnail(true);
 
-        assertNull(DatasetUtil.getThumbnail(dataset));
-        assertNull(DatasetUtil.getThumbnail(dataset, new DatasetVersion()));
+        assertNull(DatasetUtil.getThumbnail(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        assertNull(DatasetUtil.getThumbnail(dataset, new DatasetVersion(), ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test
@@ -62,7 +62,7 @@ public void testGetThumbnailRestricted() {
         thumbnailFile.setId(42l);
         thumbnailFile.setRestricted(true);
         dataset.setThumbnailFile(thumbnailFile);
-        DatasetThumbnail result = DatasetUtil.getThumbnail(dataset);
+        DatasetThumbnail result = DatasetUtil.getThumbnail(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         assertNull(result);
     }
     /**
@@ -88,7 +88,7 @@ public void testGetDefaultThumbnailFile() {
      */
     @Test
     public void testPersistDatasetLogoToStorageAndCreateThumbnail() {
-        assertNull(DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnail(null, null));
+        assertNull(DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnails(null, null));
         //Todo: a test for this that test main logic
     }
 
@@ -97,7 +97,7 @@ public void testPersistDatasetLogoToStorageAndCreateThumbnail() {
      */
     @Test
     public void testGetThumbnailAsInputStream() {
-        assertNull(DatasetUtil.getThumbnailAsInputStream(null));
+        assertNull(DatasetUtil.getThumbnailAsInputStream(null, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     /**
@@ -106,7 +106,7 @@ public void testGetThumbnailAsInputStream() {
     @Test
     public void testIsDatasetLogoPresent() {
         Dataset dataset = MocksFactory.makeDataset();
-        assertEquals(false, DatasetUtil.isDatasetLogoPresent(dataset));
+        assertEquals(false, DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
     }
 
     @Test