Gallery rework