Various styling improvements