1602 - ui bug fixed |kunal