demo app2 again
Finish layout and routes