Feature/gallery integration