Most of the restyle done