Added Calendar View
Removed overlay controller