Form Group toggle fix