Tidy up UX a tiny bit