Small ui cleanup