Improvement on Panoramio Demo layer