ToggleState on Switch and Cross added