fix bug and more ui