Adding some updates to the calendar_view, it is all set now