CSS changes done

Merge the css changes from rajib to sprint 5