Update tutorial, refactor and tweak for smaller screens.