clean up, ui change a bit