1402 halfway commit
Finish layout and routes