Abstracting the gallery
Merge branch 'gallery'

* gallery:
  Abstracting the gallery