Refactor to use generic list item view