minor fixes
Merge pull request #4717 from kurund/ui-fixes

minor fixes