UI and fixes
Merge branch 'master' of https://github.com/KirMerzlikin/Coursey