Some UX improvements

Small user experience tweaks.