Gallery: A major upgrade

Gallery: A major upgrade