Improved main checkbox. closes #39