more work on layouts