Updated router, some JS and content