fix #14 resolve property don't work for edit in widget configuration
reorder buttons and added separate buttons for expand and collapse
fix close of edit dialog