Updated versions, cleaner MainUI implementation