more ui improvment