Clean up list render and refactor for toolbar.