update route definition
fix route
new route way
Finished layout and routes