Wizard.gif and More improvements