Final gallery fixes