Improve interaction with 3D controls

I think the control works much better now with these changes.