Adding Maps and gallery fix