Issue #956 - Minor UI changes
avoid compiler warnings
Merge pull request #957 from pecko/issue956

Issue #956 - Minor UI changes