Fix checkboxes, text
CR changes
Merge pull request #3 from jedmao/fix-checkboxes-text

Fix checkboxes, text