Map tweaks and design