Fix tutorial inaccuracies
Improve layout
Update with latest patch changes