Rajib

Merge CSS changes from Rajib to Sprint 4 branch