Refactoring + changes in GalleryItem