UI updates and bug fixes