WSOTWO-142: Improved DOM for element widget
WSOTWO-142: Improved DOM for element widget