refactor UI
more ui tweaks