diff --git a/CHANGELOG b/CHANGELOG
index d23e471c0..9efb58ace 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -362,6 +362,7 @@
 - use table sorter on clear cache page and conversion services page
 - droping an url in the drag&drop area will download the url
 - add button to all password fields to make password visible
+- fix formatting of date input fields
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.42
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 59f4bd1d8..7a37b3371 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -83,6 +83,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
 
 	function preview() { /* {{{ */
 		$dms = $this->params['dms'];
+		$settings = $this->params['settings'];
 		$document = $this->params['document'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
@@ -128,10 +129,12 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style {
 	<?php
 				break;
 			case 'application/pdf':
+				if (!$settings->extensionIsDisabled('pdfviewer')) {
 				$this->contentHeading(getMLText("preview"));
 	?>
-				<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.ViewOnline.php?documentid='.$version->getDocument()->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
-	<?php
+				<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?=  urlencode(getBaseUrl().$settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$version->getDocument()->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
+<?php
+				}
 				break;
 			case 'image/svg+xml':
 			case 'image/jpg':
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8e5474abf..e2ec62896 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -639,12 +639,14 @@ $(document).ready( function() {
 <?php
 					break;
 				case 'application/pdf':
+					if (!$settings->extensionIsDisabled('pdfviewer')) {
 					$this->contentHeading(getMLText("preview"));
 ?>
 			<div style="width:100%; height: 0; position:relative; padding-top: 141%;">
-			<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
+			<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode(getBaseUrl().$settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
 			</div>
 <?php
+					}
 					break;
 				case 'image/svg+xml':
 				case 'image/jpg':
@@ -679,7 +681,7 @@ $(document).ready( function() {
 					$this->contentHeading(getMLText("preview_pdf"));
 ?>
 				<div style="width:100%; height: 0; position:relative; padding-top: 141%;">
-				<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="700px" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width:    100%; height: 100%"></iframe>
+				<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode(getBaseUrl().$settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="700px" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width:    100%; height: 100%"></iframe>
 				</div>
 <?php
 				}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index e538e627f..1a9e0835f 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1244,8 +1244,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						echo ' '.$a[0].'="'.$a[1].'"';
 				echo ">";
 				if(isset($value['options']) && is_array($value['options'])) {
-					if($allowempty)
-						echo "<option value=\"\"></option>";
+//					if($allowempty)
+//						echo "<option value=\"\"></option>";
 					foreach($value['options'] as $val) {
 						if(is_string($val)) {
 							echo '<optgroup label="'.$val.'">';
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 274beac75..270538a64 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -291,6 +291,7 @@ a.accordion2-toggle:focus, a.accordion2-toggle:hover {
 }
 .datepicker {
 	border-radius: 0px;
+	padding: 0.375rem 0.75rem;
 }
 span.datepicker {
 	padding: 0px;