merge checkbox fixes from numix master