UI bug fixes and updates