Code cleaning and introduce gallery capabilities
Update composer.lock