minnor ui tweaks
Merge branch 'dev'