More styling fixes