changed routes and app layout