Toggle map and calendar
plan stuff
Merge branch 'map'