improved test
Finish layout and routes