Merge pull request #1 from sole/bug-876011-add-some-ui

Bug 876011 add some ui