Merge in editcheckbuttons