more ui cleanup