Fixed : UI fixes
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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

Fixed : UI fixes