[Abhinav] - some ui fix