CSS Changes done

Merge Rajib CSS changes to Sprint 5