Sprint 5

Merge Rajib css changes to Master