Styling updates and fixes