summary: ui improvements
Merge branch 'master' into Adar
Merge branch 'master' into Adar
Merge branch 'Adar'