Issue #31: Fix form reset for new checkboxes.
Merge branch 'style_refactoring'