gallery/gallery views refactored
Merge pull request #1179 from mikspark/1108-gallery-update

gallery/gallery views refactored