Updated content and fix ui issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #1124 from anilgooru/dev-branch

Updated content and fix ui issue.