Improve router
Fix index