adding datepicker and some layout changes