Fixed text wrapping problems