Merge pull request #1537 from anilgooru/dev-branch

Fixed : UI fixes
reindex set to 97
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: