More styling changes and little fixes