Minor UI bug fixes