updated code
Finish layout and routes