Refactor list view