Styling and fixes