Fix #6 - Split off Panorama enhancements