Minor UI updates and related renaming