fix #445
ui tweaks
fix #438
Merge branch 'pr448'