Fixed button issue in FormLayout Helper