Aashish

Some UI changes which are needed in master branch. Please merge it in master.