making toggle click handlers more specific in hopes of getting rid of bug