Decouple map renderers. Closes #55 @2h