follow toggle buttons better