Little rework of wizard