Reworking checkbox tree