Changed form-single layout to use form layout from Metis