update with more restyle work