new router, fix pages