Update layout
Finish layout and routes