more UI fixes
Merge branch 'cmwed3'