Fix crash. Fill in yet another button. Fix restoring previous values.