Lots of changes, mainly CSS