Rework layouts,

improve performance of list items.