Couple of ui tweaks