Fix wizard navigation and spec