more UI bug fixes