Improve and clean headers wizards