Lots of aesthetic changes