fixing the calendars model and changing some layouts