More styling, fixes #357