Refactored the collection items view