minor UI changes
Merge branch 'adam'