added messages and datepicker