Added automatic viewpoint positioning and recovery