Gallery fix
Merge branch 'working'