UI updates and fixes