Fixes for #156, #155 & #83. Corrections to pivot and gizmo controls