Temporary fix for the conditional element
Update the js to support correctly the conditional elements
To improve the rendering add a span around the tag text
Fix add and delete button since we had comment field and button in the form