More ui cleanup.