layout and user new
Merge branch 'filling-in-layout'