added calendars - not in nav yet
Some prettification and renaming