clean up
UI changes