last round of ui tweaks