Finish layout and routes
New tests