Galery improvments