add more ui
fix conflict