Markup Improvements for checkboxes