Updated versions, cleaner MainUI implementation
Merge pull request #1 from mstahv/master

Updated versions, cleaner MainUI implementation