UI updates and more