Make mappings for moving around more consistent