Improve rotation and positioning