Improved checkbox control