diff --git a/assets/src/admin/patterns/components/MemoizedPatternPreview.js b/assets/src/admin/patterns/components/MemoizedPatternPreview.js
index 9c70fda..dd395fe 100644
--- a/assets/src/admin/patterns/components/MemoizedPatternPreview.js
+++ b/assets/src/admin/patterns/components/MemoizedPatternPreview.js
@@ -105,7 +105,16 @@ const MemoizedPatternPreview = memo(
 				} }
 			>
 				<div className="onedesign-pattern-title-wrapper">
-					{ isCheckBoxRequired && <CheckboxControl checked={ isSelected } /> }
+					{ isCheckBoxRequired &&
+						<CheckboxControl
+							checked={ isSelected }
+							onChange={ () => onSelect( pattern ) }
+							onClick={ ( e ) => {
+								e.stopPropagation();
+							} }
+							__nextHasNoMarginBottom
+						/>
+					}
 					<span className="onedesign-pattern-title">{ patternTitle }</span>
 				</div>
 
diff --git a/assets/src/admin/patterns/components/PatternModal.js b/assets/src/admin/patterns/components/PatternModal.js
index ae4007c..485f97f 100644
--- a/assets/src/admin/patterns/components/PatternModal.js
+++ b/assets/src/admin/patterns/components/PatternModal.js
@@ -440,6 +440,7 @@ const PatternModal = () => {
 									value={ searchTerm }
 									onChange={ handleSearchChange }
 									placeholder={ __( 'Search patterns…', 'onedesign' ) }
+									__nextHasNoMarginBottom
 								/>
 								{ renderSearchResults() }
 							</div>
diff --git a/assets/src/admin/templates/components/MemoizedTemplatePreview.js b/assets/src/admin/templates/components/MemoizedTemplatePreview.js
index 5ff1c96..bf14a2e 100644
--- a/assets/src/admin/templates/components/MemoizedTemplatePreview.js
+++ b/assets/src/admin/templates/components/MemoizedTemplatePreview.js
@@ -116,6 +116,7 @@ const MemoizedTemplatePreview = memo(
 						onClick={ ( e ) => {
 							e.stopPropagation();
 						} }
+						__nextHasNoMarginBottom
 					/> }
 					<span className="onedesign-template-title">{ templateTitle }</span>
 				</div>
diff --git a/assets/src/admin/templates/components/TemplateModal.js b/assets/src/admin/templates/components/TemplateModal.js
index 771d1f0..8cfa495 100644
--- a/assets/src/admin/templates/components/TemplateModal.js
+++ b/assets/src/admin/templates/components/TemplateModal.js
@@ -352,6 +352,7 @@ const TemplateModal = () => {
 								onChange={ ( value ) => setSearchQuery( value ) }
 								placeholder={ __( 'Search Templates', 'onedesign' ) }
 								className="onedesign-template-search"
+								__nextHasNoMarginBottom
 							/>
 							<TabPanel
 								className="onedesign-template-tabs"
diff --git a/assets/src/components/MultiSites.js b/assets/src/components/MultiSites.js
index 267dd20..2834632 100644
--- a/assets/src/components/MultiSites.js
+++ b/assets/src/components/MultiSites.js
@@ -181,6 +181,7 @@ const MultiSites = ( { setBrandSites, brandSites, setNotice } ) => {
 										label={ `${ site.name } ( ${ site?.url } )` }
 										checked={ selectedSites.includes( site.id ) }
 										onChange={ () => toggleSiteSelection( site.id ) }
+										__nextHasNoMarginBottom
 									/>
 								) ) }
 						</div>
diff --git a/assets/src/components/SiteModal.js b/assets/src/components/SiteModal.js
index 237815d..04727b0 100644
--- a/assets/src/components/SiteModal.js
+++ b/assets/src/components/SiteModal.js
@@ -282,13 +282,17 @@ const SiteModal = ( { formData, setFormData, onSubmit, onClose, editing, origina
 						onChange={ ( value ) => setFormData( { ...formData, name: value } ) }
 						error={ errors.name }
 						help={ __( 'This is the name of the site that will be registered.', 'onedesign' ) }
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 					/>
 					<TextControl
 						label={ __( 'Site URL*', 'onedesign' ) }
 						value={ formData.url }
 						onChange={ ( value ) => setFormData( { ...formData, url: value } ) }
 						error={ errors.url }
-						help={ __( 'It must start with http or https and end with /, like: https://onedesign.com/', 'onedesign' ) }
+						help={ __( 'It must start with http or https and end with /, like: https://rtcamp.com/', 'onedesign' ) }
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 					/>
 
 					{ /* Logo Media Selection */ }
@@ -296,6 +300,7 @@ const SiteModal = ( { formData, setFormData, onSubmit, onClose, editing, origina
 						id="site-logo"
 						label={ __( 'Site Logo', 'onedesign' ) }
 						help={ __( 'Select a logo for this brand site.', 'onedesign' ) }
+						__nextHasNoMarginBottom
 					>
 						<div style={ { marginTop: '8px' } }>
 							{ formData.logo && (
@@ -353,6 +358,7 @@ const SiteModal = ( { formData, setFormData, onSubmit, onClose, editing, origina
 						onChange={ ( value ) => setFormData( { ...formData, api_key: value } ) }
 						error={ errors.api_key }
 						help={ __( 'This is the api key that will be used to authenticate the site for onedesign.', 'onedesign' ) }
+						__nextHasNoMarginBottom
 					/>
 
 					<Button
diff --git a/assets/src/components/SiteSettings.js b/assets/src/components/SiteSettings.js
index 76543b7..bdf76d4 100644
--- a/assets/src/components/SiteSettings.js
+++ b/assets/src/components/SiteSettings.js
@@ -222,6 +222,7 @@ const SiteSettings = () => {
 							value={ apiKey }
 							disabled={ true }
 							help={ __( 'This key is used for secure communication with the Governing site.', 'onedesign' ) }
+							__nextHasNoMarginBottom
 						/>
 					</div>
 				</CardBody>
@@ -247,6 +248,8 @@ const SiteSettings = () => {
 						value={ governingSite }
 						disabled={ true }
 						help={ __( 'This is the URL of the Governing site this Brand site is connected to.', 'onedesign' ) }
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
 					/>
 				</CardBody>
 			</Card>