Finish layout and routes
Improve tests