Fix html structure in router
Merge branch 'i75' into wip
Fix leakage of defined variables in router to handlers
Merge branch 'i76' into wip