resize edit panel
resize edit panel. merge conflicts resolved