Fix issues with text wrapping