more work on the layout