Refactored collection view cell