improved map layout and movement