[DF-639] change ui control hierarchy