minor touch-ups to toggle buttons