Moving now works.
Improved selecting shapes