Overhaul keychain app