Make re-render faster and fix player icons