Toggle map layers via tabs
Merge branch 'feature/map-layers' into develop
Merge branch 'develop'