Layout 2
Finish layout and routes