More work on edit panel