Gallery update (WIP)

Fix #1121 and #1073