Improve some small text and layout issues