CSS modification#24sep
conflicts remove in estimate/index#24sep
Merge pull request #431 from vaibhavcisin274/prachi

Prachi
changes