changed layout
Merge branch 'master' into filling-in-layout
changed URIs
Finish layou and routes