Refactored collection items into template views