Styling changes and fixes