Added modals and datepicker