Issue 116 wizard prev step restriction

Closes #303 and #116