cleanup
Merge pull request #317 from davherrmann/issue#170

cleanup in MainUI