Lots of style updates