Modify layouts
Finish layout and routes