Big style and perfs update