Further enhancements to gallery/image organization