Add routes and integrate tests
finish layout and routes