Better page routing
Merge branch 'master' of github.com:mrhenry/lalala-ng