Streamlined KeyStorage and CertificateStorage. Implemented more key handling menu items.