Map uniformity

Hooray for auto merging. Seems to fix the tiling issues. May want someone from front end to take a quick look at it though just to make sure.