Merge pull request #3 from aptara/Gauri

Gauri
Content management UI fixes
Merge pull request #4 from aptara/Sushil

Content management UI fixes
Defect Fix for Sprint 1 & 2