reorganize nav buttons
Merge branch 'master' into refactor
Refactored get_any_calendar into separate functions