More styling changes, fixes #1