fixes to how the calendar is launched from the side bar and primary nav and some small fixes / changes