Lots of styling fixes