Fixed text wrapping. Seems good now (but needs a true graphical test).