More gallery hackery