Made changes to app router and controllers to make the work.