Fixed tab-order + page title
Merge branch 'demo' of https://github.com/utwente-di/di10 into demo