Finish layout and routes and fixed tests