Styling and fixes 2