Some UI bug fixes