Defect Fixes

2448
2557
company info toggler
Merge branch 'master' into Saumya