More styling improvements