Bugfix test courses
Update UI buttons & misc bugfixes