Gallery 1 & 2 Fixes