WSOTWO-142: Improved DOM for element widget