Styling bug fixes and minor improvements.