UI-3143: UIDashboar improvement