Collection view refactored