User interface could be cleaner

Other MUBR issues: