Improved how title wrapping is done