More UI issue fixes
Merge branch 'master' of https://github.com/tamojit/Mercury