Bug 15773: Fix and standardise checkboxes code in framework