Lots of styling and other changes