More ui cleanup