add layout s
Finish layout and routes