Further styling fixes