BRANCH 4.3: more clean-up of UI