UI updates and tweaks