Added datepicker, UI changes