diff --git a/css/DMSDocumentCMSFields.css b/css/DMSDocumentCMSFields.css
index f7159c2..54c7c61 100644
--- a/css/DMSDocumentCMSFields.css
+++ b/css/DMSDocumentCMSFields.css
@@ -45,7 +45,7 @@ form.small #ActionsPanel .middleColumn { margin-left: 120px; }
 #ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel .btn-icon-deleteLight { background-position: 0 -128px; display: inline-block; }
 #ActionsPanel .ss-uploadfield-files .ss-uploadfield-item-actions .ss-uploadfield-item-cancel .ui-button-text { display: block; position: relative; float: right; color: #555; padding: 0; padding-left: 2em; }
 
-#Form_ItemEditForm fieldset table.ss-gridfield-table { width: 508px; }
+#Form_ItemEditForm fieldset table.ss-gridfield-table { width: 494px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main { min-width: 175px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr th.main.col-action_SetOrderID { width: 60px; min-width: 60px; }
 #Form_ItemEditForm fieldset table.ss-gridfield-table tr td { white-space: normal; }
diff --git a/javascript/DMSDocumentCMSFields.js b/javascript/DMSDocumentCMSFields.js
index 2a99bb1..f926682 100644
--- a/javascript/DMSDocumentCMSFields.js
+++ b/javascript/DMSDocumentCMSFields.js
@@ -76,6 +76,18 @@
 
 				//add some extra classes to the replace field containers to make it work with drag and drop uploading
 				this.find('.replace').closest('div.fieldgroup-field').addClass('ss-upload').addClass('ss-uploadfield');
+				
+				//Add placeholder attribute to date and time fields
+				$('#Form_ItemEditForm_EmbargoedUntilDate-date').attr('placeholder', 'dd-mm-yyyy');
+				$('#Form_ItemEditForm_EmbargoedUntilDate-time').attr('placeholder', 'hh:mm:ss');
+				$('#Form_ItemEditForm_ExpireAtDate-date').attr('placeholder', 'dd-mm-yyyy');
+				$('#Form_ItemEditForm_ExpireAtDate-time').attr('placeholder', 'hh:mm:ss');
+				// We need to duplicate to work when adding documents
+				$('#Form_EditForm_EmbargoedUntilDate-date').attr('placeholder', 'dd-mm-yyyy');
+				$('#Form_EditForm_EmbargoedUntilDate-time').attr('placeholder', 'hh:mm:ss');
+				$('#Form_EditForm_ExpireAtDate-date').attr('placeholder', 'dd-mm-yyyy');
+				$('#Form_EditForm_ExpireAtDate-time').attr('placeholder', 'hh:mm:ss');
+
 
 				$('#Form_ItemEditForm_EmbargoedUntilDate-date').closest('.fieldholder-small').addClass('embargoDatetime').hide();
 				$('#Form_ItemEditForm_ExpireAtDate-date').closest('.fieldholder-small').addClass('expiryDatetime').hide();
diff --git a/scss/DMSDocumentCMSFields.scss b/scss/DMSDocumentCMSFields.scss
index 0aa5759..d7d1bd7 100644
--- a/scss/DMSDocumentCMSFields.scss
+++ b/scss/DMSDocumentCMSFields.scss
@@ -229,7 +229,7 @@ form.small .field .TreeDropdownField,
 #Form_ItemEditForm{
 	fieldset{
 		table.ss-gridfield-table{
-			width: 508px;
+			width: 494px;
 			//max-width:508px;
 			tr{
 				th.main{