UI updates, minor changes