small changes
Finish layout and routes