Added text wrapping and no list linebreak