Merge pull request #382 from panseo/test

Update wizard layout, and insert new help