Improved pick/fly/orbit behaviour