Sorted datepicker, formatting issues. need to sort out Pundit issues