fix #445, ui tweaks, fix #438