Fix various issues and make the key/value wizard sortable