Styling updates, fixes