Fixed panorama image size
Cleaned up code