Fixed ui issues.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  "keywords issue resolved"
Merge pull request #1122 from anilgooru/dev-branch

Fixed ui issues.