cleanup
move ui