Dileep/Yogesh | 2684 | Fixed ui and failing test