Changed checkbox structure