improve design
Merge branch 'early-draft' of https://github.com/oeco/mapascoletivos into early-draft