1670 | ui fix |kunal