Merge Rajib UI changes to sprint 3