Minor UI tweak and lag fix