Styling changes and content tidy up