Fixed CardFormFragment state issues