Fix and test gallery