Many fixes to help text and layout