Boostrap formatting for checkboxes and radio buttons
More bug fixes