Final cleanups on key import/export work. Rationalised the UI (so