A bunch of styling fixes