fix rotation bug, improve UX