refactor list view a bit