Minor language and UX tweaks