bug fixes defect formatting
Merge remote-tracking branch 'origin/master' into Saumya
Defect Fixes

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