5.2 layout
Finish layout and routes