Update: enhanced wizard and pages