Shape rotation now working

All selectors are behaving predictably - changed conditionals to
prevent cursor-switching while dragging.

Various adjustments to positions of things on screen.