Refactor layout
Merge branch 'knockout' of github.com:innoq/spa-workshop into knockout