Refactor layout and test
Finish layout and routes