Allow images on choice buttons, misc