updated routes and layout