Tweaking map and nav