Nanda/ Ashwin| #0000 |Fixing UI defects.