more work on edit button, but still not complete