Improve UX and other clean-up. (Don't know what I'm doing, in fact.)