added calendars and events links to the default layout
removed link to events
events display the calendar name rather than the calendar id