make named routes, pithy up test
Merge branch 'filling-in-layout'