defined layout
Merge branch 'filling-in-layout'
cleaned up spec files