ui improvements
ui improvements
Merge branch 'michel'