diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 0d109f73f06..92beaf3210f 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -513,70 +513,6 @@
     </div>
     <!-- / TERMS -->
 
-    <!-- Preview Guestbook -->
-    <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
-        <div class="form-horizontal">
-            <p class="help-block">
-                #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook.title']}
-            </p>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">
-                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}
-                </label>
-                <div class="col-sm-8">
-                    <p class="form-control-static">
-                        #{DatasetPage.selectedGuestbook.name}
-                    </p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">
-                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
-                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
-                </label>
-                <div class="col-sm-8">
-                    <p class="form-control-static">
-                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.accountInformation']}"/>
-                        <ul>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredAccountInformation}" var="ai">
-                                <li>
-                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                </li>
-                            </ui:repeat>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalAccountInformation}" var="ai">
-                                <li>
-                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                </li>
-                            </ui:repeat>
-                        </ul>
-                    </p>
-                    
-                    <ui:fragment rendered="#{!empty DatasetPage.selectedGuestbook.requiredQuestionsList or !empty DatasetPage.selectedGuestbook.optionalQuestionsList}">
-                    <p class="form-control-static">
-                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions']}"/>
-                        <ul>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredQuestionsList}" var="q">
-                                <li>
-                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
-                                </li>
-                            </ui:repeat>
-                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalQuestionsList}" var="q">
-                                <li>
-                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
-                                </li>
-                            </ui:repeat>
-                        </ul>
-                    </p>
-                    </ui:fragment>
-                </div>
-            </div>
-        </div>
-        <div class="button-block">
-            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
-                #{bundle.close}
-            </button>
-        </div>
-    </p:dialog>
+
     <!-- / Preview Guestbook -->
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index 14be8d1787c..34fae0ea0a6 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -22,9 +22,10 @@
                     <f:viewAction action="#{DatasetWidgetsPage.init}" />
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(DatasetWidgetsPage.dataset, bundle['dataset.thumbnailsAndWidget.breadcrumbs.title'])}"/>
                 </f:metadata>
+                <h:form id="themeWidgetsForm" styleClass="row form-horizontal">
                 <p:tabView rendered="#{themeWidgetFragment.editDv!=null}" id="themeWidgetsTabView" widgetVar="content">
                     <p:tab id="thumbnailsTab" title="#{bundle['dataset.thumbnailsAndWidget.thumbnails.title']}">
-                        <h:form id="themeWidgetsForm" styleClass="row form-horizontal">
+
                             <div class="form-group" jsf:rendered="#{true or themeWidgetFragment.editDv.themeRoot}">
                                 <label class="col-sm-3 control-label" for="logoFormat">
                                     #{bundle['dataset.thumbnailsAndWidget.thumbnailImage']}
@@ -82,47 +83,7 @@
                                 <p:commandButton styleClass="btn btn-link" update="@form" value="#{bundle.cancel}" action="#{DatasetWidgetsPage.cancel()}"/>
                             </div>
 
-                            <p:dialog id="confrmRemove" header="#{bundle['dataset.thumbnailsAndWidget.removeThumbnail']}" widgetVar="confrmRemove" modal="true">
-                                <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>
-                                </div>
-                            </p:dialog>
-                        </h:form>
+
                     </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}">
@@ -184,7 +145,51 @@
                         </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>
+                        </div>
+                    </p:dialog>
+
+               </h:form>
             </ui:define>
         </ui:composition>
+
     </h:body>
 </html>
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index d907aa5aceb..50e7ad53404 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -1323,6 +1323,10 @@
                             <ui:param name="fileDownloadService" value="#{DatasetPage.fileDownloadService}"/>
                         </ui:include>
                     </p:dialog>
+                    <!-- Preview Guestbook -->
+                    <p:dialog id="previewGuestbook" styleClass="largePopUp" header="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.header']}" widgetVar="viewGuestbook" modal="true">
+                        <ui:include src="guestbook-preview-popup-fragment.xhtml"></ui:include>
+                    </p:dialog>
                     <p:dialog id="downloadPackagePopup" styleClass="smallPopUp" header="#{bundle['packageDownload.title']}" widgetVar="downloadPackagePopup" modal="true">
                         <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
                         <ui:include src="package-download-popup-fragment.xhtml">
diff --git a/src/main/webapp/guestbook-preview-popup-fragment.xhtml b/src/main/webapp/guestbook-preview-popup-fragment.xhtml
new file mode 100644
index 00000000000..a2640cf1b79
--- /dev/null
+++ b/src/main/webapp/guestbook-preview-popup-fragment.xhtml
@@ -0,0 +1,80 @@
+<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"
+                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+
+
+        <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
+        <p:focus context="downloadPopup"/>
+        <p class="help-block">
+            #{bundle['file.downloadDialog.tip']}
+        </p>
+        
+        <div class="form-horizontal">
+            <p class="help-block">
+                #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook.title']}
+            </p>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">
+                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.datasetGuestbook']}
+                </label>
+                <div class="col-sm-8">
+                    <p class="form-control-static">
+                        #{DatasetPage.selectedGuestbook.name}
+                    </p>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">
+                    #{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData']}
+                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageGuestbooks.tab.action.btn.view.dialog.userCollectedData.title']}"></span>
+                </label>
+                <div class="col-sm-8">
+                    <p class="form-control-static">
+                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.accountInformation']}"/>
+                        <ul>
+                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredAccountInformation}" var="ai">
+                                <li>
+                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
+                                </li>
+                            </ui:repeat>
+                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalAccountInformation}" var="ai">
+                                <li>
+                                    <h:outputText value="#{ai} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
+                                </li>
+                            </ui:repeat>
+                        </ul>
+                    </p>
+                    
+                    <ui:fragment rendered="#{!empty DatasetPage.selectedGuestbook.requiredQuestionsList or !empty DatasetPage.selectedGuestbook.optionalQuestionsList}">
+                    <p class="form-control-static">
+                        <h:outputText value="#{bundle['dataset.manageGuestbooks.guestbook.customQuestions']}"/>
+                        <ul>
+                            <ui:repeat value="#{DatasetPage.selectedGuestbook.requiredQuestionsList}" var="q">
+                                <li>
+                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.required']}"/>
+                                </li>
+                            </ui:repeat>
+                            <ui:repeat value="#{DatasetPage.selectedGuestbook.optionalQuestionsList}" var="q">
+                                <li>
+                                    <h:outputText value="#{q} #{bundle['dataset.manageGuestbooks.guestbook.optional']}"/>
+                                </li>
+                            </ui:repeat>
+                        </ul>
+                    </p>
+                    </ui:fragment>
+                </div>
+            </div>
+        </div>
+        <div class="button-block">
+            <button class="btn btn-default" onclick="PF('viewGuestbook').hide()" type="button">
+                #{bundle.close}
+            </button>
+        </div>
+</ui:composition>