[TASK] Sort and create page wizard cleanup