Evemn more ui tweaks