Actually use layout
Some more work