Modify layout
Finish layout and routes