Styling and minor bug fixes