simplify layout - Ch4
Finish layout and routes