CS
Refactor list rendering