Changed dict comprehension for python 2.6 compatibility
Changed template so the label is correctly linked with the checkbox (you can click the label to select the checkbox)