Fixed up those global click handlers