UX tweaks to it's not quite as terrible ...