Finish layout and routes, NOTE: the tests dont pass and the routes are not right