[DF-731] dawawidget in ui hierarchy fixes