couple bug UI bug fix