ImageAlbum refactored