Initial changes to CalendarAdapter for better date format handling