Some more work on the layout