Changes in span id and start removing (not working yet)
Merge remote-tracking branch 'ariana/master' into form-widget
before merge with ariana