update layout
update layout
Finishing layout and routes