FIX: Gallery

Ready for review/merge.
This seems fine to me.