More modifications to datepicker