Fixed some bugs (with multilines) and introduced a wrapper element.