BRANCH 4.2-DEV: more UI work