Minor change to click event handlers
Minor fix to option labels
Fix to better handle HTML in field labels for image choices