couple UI bug fix