Fix layout issues in CoreConfigWizard; cleanup