BRANCH 4.2-DEV: more development on UI redesign