more work on edit layout