One more tweak to the UX