several ui tweaks