Final fixes to checkbox