More styling changes. Not necessarily final.