Finish demo app
Finish layout and routes