Better checkboxes, added more calculators