VCDN-113 implementing Kristina recommendation for UI