Nate ui cleanup more