Vishal, Abhi #628 Fixing UI