added ui cleanup