Use separate router, fix challenge view navigation