Fix incorrect view templates and wrap it up.

While the tutorial could have many more stages, I'd like to get it
mainlined and remove the blog/bookmarks tutorial and then expand this
tutorial further.