some ui cleanup