fixed the routes and layout