Draft, media, wizard fixes
Wizard fixes