Add masonry wall at /images
Move gallery to same page as map
Update Map button to switch on map view
Resolve merge conflict