9/9 tests working
Finish layout and routes