more wizard improvements, navigation now working