more work on layout