Finish Layout and routes
Merge branch 'master' into fillin-in-layout