Some adjustments to toggle buttons