Connected Calendar View + Bug fixes