Misc cleanup of keypair pages.  GUI-61