UI Fixed for class code.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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

UI Fixed for class code.