Update panorama code based on feedback