Update gallery with changes from @garnettb