Fix map toggle
Merge branch 'master' into photo