Minor change to UX, plus a little more cutting.