Gallery performance + bug fixes