Fix #7 - Split off Panorama enhancements