Making changes to UI, working on CalendarView