refactor to app router, small changes