more UI updates and a couple of UI bug fixes