july 19 commit
Finish layout and routes