Reordering of draw functions
Merge branch 'grab-drag' into relative-rot
Relative translation