Styling changes and other fixes