more ui bug fix