Starting first round of ui cleanup