FIX: Gallery

Ready for review/merge.
+1  (assuming tests pass)