@@ -77,9 +77,7 @@ export default function SetupForm( { finishSetup } ) {
 			/>
 			<OptimizeIDFieldInstructions />
 
-			<div className="googlesitekit-setup-module__inputs">
-				<OptimizeIDField />
-			</div>
+			<OptimizeIDField />
 
 			{ ! isValidOptimizeID( optimizeID ) && optimizeID && (
 				<ErrorText
/**
 * Optimize Setup form.
 *
 * Site Kit by Google, Copyright 2021 Google LLC
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/**
 * External dependencies
 */
import PropTypes from 'prop-types';

/**
 * WordPress dependencies
 */
import { useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';

/**
 * Internal dependencies
 */
import Data from 'googlesitekit-data';
import Button from '../../../../components/Button';
import { MODULES_OPTIMIZE } from '../../datastore/constants';
import { isValidOptimizeID } from '../../util';
import StoreErrorNotices from '../../../../components/StoreErrorNotices';
import ErrorText from '../../../../components/ErrorText';
import {
	AMPExperimentJSONField,
	OptimizeIDField,
	OptimizeSnippetNotice,
	UseSnippetInstructions,
	OptimizeIDFieldInstructions,
	AnalyticsNotice,
} from '../common';
const { useSelect, useDispatch } = Data;

export default function SetupForm( { finishSetup } ) {
	const canSubmitChanges = useSelect( ( select ) =>
		select( MODULES_OPTIMIZE ).canSubmitChanges()
	);
	const optimizeID = useSelect( ( select ) =>
		select( MODULES_OPTIMIZE ).getOptimizeID()
	);

	const { submitChanges } = useDispatch( MODULES_OPTIMIZE );
	const submitForm = useCallback(
		async ( event ) => {
			event.preventDefault();
			const { error } = await submitChanges();
			if ( ! error ) {
				finishSetup();
			}
		},
		[ finishSetup, submitChanges ]
	);

	return (
		<form
			className="googlesitekit-optimize-setup__form"
			onSubmit={ submitForm }
		>
			<StoreErrorNotices
				moduleSlug="optimize"
				storeName={ MODULES_OPTIMIZE }
			/>
			<OptimizeIDFieldInstructions />

			<div className="googlesitekit-setup-module__inputs">
				<OptimizeIDField />
			</div>

			{ ! isValidOptimizeID( optimizeID ) && optimizeID && (
				<ErrorText
					message={ __(
						'Not a valid Optimize ID.',
						'google-site-kit'
					) }
				/>
			) }

			<AnalyticsNotice />

			<AMPExperimentJSONField />

			<UseSnippetInstructions />

			<OptimizeSnippetNotice />

			<div className="googlesitekit-setup-module__action">
				<Button disabled={ ! canSubmitChanges }>
					{ __( 'Configure Optimize', 'google-site-kit' ) }
				</Button>
			</div>
		</form>
	);
}

SetupForm.propTypes = {
	finishSetup: PropTypes.func,
};

SetupForm.defaultProps = {
	finishSetup: () => {},
};

This class should be kept for consistency with the other setup form components.