FIX: Gallery

Ready for review/merge.