clean up, and ui upgrade