A couple of UX suggestions