BRANCH 4.2-ui: minor tweaks for new ui