Cleanup + Composer update
Layout update + index modifications