Refactor album listing items