Unbreak the map

Need to extract/refactor map styling