Issue #956 - Minor UI changes