Merge Rajib CSS change to Sprint 4