More work on add subkey dialog design