Various small styling fixes