Added separate router
Bugfixes with jshint