fixed formatting and added back datepicker