diff --git a/src/OnboardingSPA/components/Button/NavCardButton/stylesheet.scss b/src/OnboardingSPA/components/Button/NavCardButton/stylesheet.scss
index 47608d98d..6f8589b0a 100644
--- a/src/OnboardingSPA/components/Button/NavCardButton/stylesheet.scss
+++ b/src/OnboardingSPA/components/Button/NavCardButton/stylesheet.scss
@@ -1,12 +1,19 @@
 .nfd-nav-card-button {
 	color: var(--nfd-onboarding-white);
 	background-color: var(--wp-admin-theme-color-darker-10);
-	height: 8vh;
-	width: 50vw;
-	margin: 0vw auto;
+	padding: 16px;
+	width: 90%;
 	font-size: clamp(0.7rem, 1.2vw, 1.4em);
 	font-weight: 500;
 	border-radius: 4px;
 	border: none;
 	outline: 1px solid transparent;
+
+	@media (max-width: #{($break-medium)}) {
+		padding: 24px 32px;
+	}
+
+	@media (min-width: 2600px) {
+		font-size: clamp(2.81rem, -0.48vw + 2.93rem, 1.78rem);
+	}
 }
\ No newline at end of file
diff --git a/src/OnboardingSPA/components/CardHeader/stylesheet.scss b/src/OnboardingSPA/components/CardHeader/stylesheet.scss
index 2e9492629..102b3a51b 100644
--- a/src/OnboardingSPA/components/CardHeader/stylesheet.scss
+++ b/src/OnboardingSPA/components/CardHeader/stylesheet.scss
@@ -1,12 +1,18 @@
 .nfd-step-card-heading {
-	margin: 8px;
+	margin: 5px;
 	font-weight: 700;
 	line-height: 1.25;
 	text-align: center;
-	font-size: clamp(1.5rem, 4vw, 2.2rem);
+	font-size: clamp(1.5rem, 1.82vw + 1.05rem, 2.5rem);
+
+	@media (max-width: #{($break-medium)}) {
+		font-size: clamp(1rem, 3.5vw, 1.2rem);
+		margin: 10px;
+	}
 
-	@media (max-width: #{ ($break-xlarge)}) {
-		font-size: clamp(1rem, 3.5vw, 2rem);
+	@media (min-width: 2600px) {
+		font-size: clamp(1rem, 2.44vw + 0.39rem, 6.25rem);
+		margin: 40px;
 	}
 }
 
@@ -14,17 +20,41 @@
 	margin: 5px;
 	font-weight: 700;
 	color: var(--wp-admin-theme-color);
-	font-size: clamp(0.8rem, 2.5vw, 1.2rem);
+	font-size: clamp(1rem, 0.91vw + 0.77rem, 1.5rem);
+	text-align: center;
+	@media (min-width: #{ ($break-medium)}) {
+		padding-bottom: 30px;
+	}
+  
+	@media (min-width: 2600px) {
+		font-size: clamp(3.38rem, -0.47vw + 3.49rem, 2.37rem);
+		margin: 80px;
+	}
 }
 
 .nfd-step-card-subheading-other {
 	font-weight: 700;
-	margin-top: 30px;
+	margin-top: 35px;
 	color: var(--wp-admin-theme-color);
 	font-size: clamp(0.8rem, 2.5vw, 1.2rem);
+	@media (max-width: #{($break-medium)}) {
+		margin: 3px;
+		font-size: clamp(0.7rem, 2.2vw, 1.2rem);
+	}
+
+	@media (min-width: 2600px) {
+		font-size: clamp(3.38rem, -0.47vw + 3.49rem, 2.37rem);
+		margin: 80px;
+	}
 }
 
 .nfd-step-card-question {
-	margin: 8px;
+	margin: 18px;
 	font-size: clamp(1rem, 2vw, 1.8rem);
+
+	@media (min-width: 2600px) {
+		font-size: clamp(3.38rem, -0.47vw + 3.49rem, 2.37rem);
+		font-weight: 700;
+		margin: 60px;
+	}
 }
diff --git a/src/OnboardingSPA/components/Header/stylesheet.scss b/src/OnboardingSPA/components/Header/stylesheet.scss
index 59114c622..2d541d0c4 100644
--- a/src/OnboardingSPA/components/Header/stylesheet.scss
+++ b/src/OnboardingSPA/components/Header/stylesheet.scss
@@ -36,7 +36,7 @@
         height: 100%;
         flex-grow: 1;
         justify-content: center;
-        min-width: 0;
+        min-width: 5px;
         font-weight: 600;
         font-size: 20px;
         line-height: $grid-unit-30;
@@ -95,5 +95,10 @@
     &_finish {
         padding-left: 22px !important;
     }
+
+    @media screen and (max-width: #{ ($break-medium) }) {
+        font-size: 13px;
+        padding: 15px 10px !important; 
+    }
 }
 
diff --git a/src/OnboardingSPA/components/NeedHelpTag/stylesheet.scss b/src/OnboardingSPA/components/NeedHelpTag/stylesheet.scss
index c81df0969..4cdf41e0a 100644
--- a/src/OnboardingSPA/components/NeedHelpTag/stylesheet.scss
+++ b/src/OnboardingSPA/components/NeedHelpTag/stylesheet.scss
@@ -9,4 +9,13 @@
 		text-decoration: none;
 		padding: 0px 0.4rem;
 	}
+
+	@media (max-width: #{($break-medium)}) {
+		padding: 9px;
+	}
+
+	@media (min-width: 2600px) {
+		font-size: clamp(1.6rem, -0.09vw + 1rem, 1.78rem);
+		font-weight: 450;
+	}
 }
diff --git a/src/OnboardingSPA/components/NewfoldLargeCard/stylesheet.scss b/src/OnboardingSPA/components/NewfoldLargeCard/stylesheet.scss
index a0a235127..8c77d18e9 100644
--- a/src/OnboardingSPA/components/NewfoldLargeCard/stylesheet.scss
+++ b/src/OnboardingSPA/components/NewfoldLargeCard/stylesheet.scss
@@ -1,39 +1,62 @@
 .nfd-onboarding-large-card {
 	display: flex;
+	max-width: 960px;
 	width: 60vw;
-	height: 70vh;
+	min-height: 60vh;
 	background: var(--nfd-onboarding-light);
 	position: relative;
 	transform-style: preserve-3d;
 	align-items: center;
 	flex-direction: column;
 	justify-content: space-evenly;
-	padding: 1rem;
+	padding: 24px 32px;
+	margin: 20px;
 
 	@media (max-width: #{($break-medium - 1)}) {
 		justify-items: center;
 		align-items: center;
-		padding: 30px;
+		padding: 16px;
 		transform-style: flat;
 	}
 
 	&::before {
 		content: "";
 		background: var(--nfd-onboarding-dark-icon) no-repeat;
-		width: 45vw;
-		height: 45vh;
+		width: 600px;
+		min-height: 500px;
 		transform: rotate(-14deg) translateZ(-1px);
 		position: absolute;
-		left: -10rem;
-		top: 0rem;
-		@media (max-width: #{ ($break-medium - 1) }) {
+		left: -15rem;
+		top: 2rem;
+	}
+
+	@media (max-width: #{ ($break-medium - 1) }) {
+		justify-items: center;
+		align-items: center;
+		transform-style: flat;
+		padding: 20px;
+		margin: 30px;
+		&::before {
 			display: none;
 		}
-		@media (min-width: #{ ($break-medium) }) and (max-width: 925px) {
-			width: 27vw;
-			height: 27vh;
-			left: -7rem;
-			margin-top: 5vh;
+	}
+
+	@media (min-width: #{ ($break-medium) }) and (max-width: 1300px) {
+		&::before {
+			width: 400px;
+			height: 350px;
+			left: -10.5rem;
+		}
+	}
+
+	@media (min-width: 2600px) {
+		max-width: 100%;
+		width: 50vw;
+		min-height: 960px;
+		&::before {
+			width: 860px;
+			min-height: 600px;
+			left: -19rem;
 		}
 	}
 
diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js
index 33c51908e..4028a2e0b 100644
--- a/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js
+++ b/src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/index.js
@@ -42,7 +42,6 @@ const StepAddress = () => {
 	useEffect(() => {
 		let addressKeys = [
 			'woocommerce_store_address',
-			'woocommerce_store_address_2',
 			'woocommerce_store_city',
 			'woocommerce_store_postcode',
 			'woocommerce_default_country'
@@ -72,8 +71,8 @@ const StepAddress = () => {
 	let defaultPlace =
 		address?.woocommerce_default_country ??
 		settings?.woocommerce_default_country ??
-		"US:AZ";
-	let [defaultCountry, defaultState] = defaultPlace.split(":");
+		'US:AZ';
+	let [defaultCountry, defaultState] = defaultPlace.split(':');
 	let selectedCountry = address?.country ?? defaultCountry;
 	let states =
 		countries?.find((country) => country.code === selectedCountry)?.states ??
@@ -81,12 +80,17 @@ const StepAddress = () => {
 	function handleFieldChange(event) {
 		let fieldName = event.target.name;
 		let newValue = event.target.value;
-		let { country = selectedCountry, state = defaultState } = address;
-		let place = "";
-		if (["country", "state"].includes(fieldName)) {
+		let { country = selectedCountry, state } = address;
+		if (country === defaultCountry && state === undefined) {
+			state = defaultState;
+		}
+		let place = '';
+		if (['country', 'state'].includes(fieldName)) {
 			place =
-				fieldName === "country"
-					? `${newValue}:${state}`
+				fieldName === 'country'
+					? state
+						? `${newValue}:${state}`
+						: newValue
 					: `${country}:${newValue}`;
 		}
 		setCurrentOnboardingData({
@@ -95,7 +99,7 @@ const StepAddress = () => {
 				address: {
 					...currentData.storeDetails.address,
 					[fieldName]: newValue,
-					...(place !== "" && {
+					...(place !== '' && {
 						woocommerce_default_country: place,
 					}),
 				},
@@ -104,8 +108,8 @@ const StepAddress = () => {
 	}
 	return (
 		<CommonLayout isBgPrimary isCentered>
-			<NewfoldLargeCard className='nfd-ecommerce-address-step'>
-				<div className='nfd-onboarding-experience-step onboarding-ecommerce-step'>
+			<NewfoldLargeCard className='ecommerce-step nfd-ecommerce-address-step'>
+				<div className='onboarding-ecommerce-step'>
 					<form
 						className='onboarding-ecommerce-step'
 						onSubmit={(event) => {
@@ -130,90 +134,102 @@ const StepAddress = () => {
 						<div className='nfd-card-heading center onboarding-ecommerce-step'>
 							<CardHeader
 								heading={__(content.stepAddressHeading, 'wp-module-onboarding')}
-								subHeading={__(content.stepAddressSubHeading, 'wp-module-onboarding')}
+								subHeading={__(
+									content.stepAddressSubHeading,
+									'wp-module-onboarding'
+								)}
 							/>
 							{settings === null && <p>Loading your details...</p>}
 						</div>
 						<div className='store-address-form'>
 							<div>
-								<label>{__('Address line 1', 'wp-module-onboarding')}</label>
-								<input
-									name='woocommerce_store_address'
-									type='text'
-									required
-									defaultValue={address?.woocommerce_store_address}
-									{...fieldProps}
-								/>
-							</div>
-							<div>
-								<label>{__('Address line 2', 'wp-module-onboarding')}</label>
-								<input
-									name='woocommerce_store_address_2'
-									type='text'
-									defaultValue={address?.woocommerce_store_address_2}
-									{...fieldProps}
-								/>
-							</div>
-							<div>
-								<label>{__('City', 'wp-module-onboarding')}</label>
-								<input
-									name='woocommerce_store_city'
-									type='text'
-									required
-									defaultValue={address?.woocommerce_store_city}
-									{...fieldProps}
-								/>
-							</div>
-							<div>
-								<label>{__('State', 'wp-module-onboarding')}</label>
-								{states.length === 0 || settings === null ? (
-									<input type='text' name='state' disabled={settings === null} {...fieldProps} />
+								<label data-required>
+									{__('Where is your store based?', 'wp-module-onboarding')}
+								</label>
+								{settings === null ? (
+									<input type='text' disabled />
 								) : (
 									<select
 										type='text'
-										name='state'
+										name='country'
 										required
-										defaultValue={defaultState}
+										defaultValue={selectedCountry}
 										{...fieldProps}
 									>
-										{states.map((state) => (
-											<option key={state.code} value={state.code}>
-												{state.name}
+										{countries.map((country) => (
+											<option key={country.code} value={country.code}>
+												{country.name}
 											</option>
 										))}
 									</select>
 								)}
 							</div>
 							<div>
-								<label>{__('Postal Code', 'wp-module-onboarding')}</label>
+								<label data-required>
+									{__('Address', 'wp-module-onboarding')}
+								</label>
 								<input
-									name='woocommerce_store_postcode'
+									name='woocommerce_store_address'
 									type='text'
 									required
-									defaultValue={address?.woocommerce_store_postcode}
+									defaultValue={address?.woocommerce_store_address}
 									{...fieldProps}
 								/>
 							</div>
-							<div>
-								<label>{__('Country', 'wp-module-onboarding')}</label>
-								{settings === null ? (
-									<input type='text' disabled />
-								) : (
-									<select
+							<div className='sm:col-layout md:row-layout full-address-fields'>
+								<div>
+									<label data-required>
+										{__('City', 'wp-module-onboarding')}
+									</label>
+									<input
+										name='woocommerce_store_city'
 										type='text'
-										name='country'
 										required
-										defaultValue={selectedCountry}
+										defaultValue={address?.woocommerce_store_city}
 										{...fieldProps}
-									>
-										{countries.map((country) => (
-											<option key={country.code} value={country.code}>
-												{country.name}
-											</option>
-										))}
-									</select>
-								)}
+									/>
+								</div>
+								<div>
+									<label data-required>
+										{__('State', 'wp-module-onboarding')}
+									</label>
+									{states.length === 0 || settings === null ? (
+										<input
+											type='text'
+											name='state'
+											disabled={settings === null}
+											{...fieldProps}
+										/>
+									) : (
+										<select
+											type='text'
+											name='state'
+											required
+											defaultValue={defaultState}
+											{...fieldProps}
+										>
+											{states.map((state) => (
+												<option key={state.code} value={state.code}>
+													{state.name}
+												</option>
+											))}
+										</select>
+									)}
+								</div>
+								<div>
+									<label data-required>
+										{__('Postal Code', 'wp-module-onboarding')}
+									</label>
+									<input
+										name='woocommerce_store_postcode'
+										type='text'
+										required
+										defaultValue={address?.woocommerce_store_postcode}
+										{...fieldProps}
+									/>
+								</div>
 							</div>
+							<em style={{ display: 'inline' }}>* required</em>
 						</div>
 						<button
 							className='nfd-nav-card-button nfd-card-button'
diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js
index 00732c448..e8ec55970 100644
--- a/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js
+++ b/src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/index.js
@@ -59,7 +59,7 @@ const StepProducts = () => {
 
 	return (
 		<CommonLayout isBgPrimary isCentered>
-			<NewfoldLargeCard>
+			<NewfoldLargeCard className='ecommerce-step' >
 				<div className='nfd-onboarding-experience-step onboarding-product-step onboarding-ecommerce-step'>
 					<div className='nfd-card-heading center'>
 						<CardHeader
diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js
index 8239a0a0e..5ddeb6f26 100644
--- a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js
+++ b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/index.js
@@ -75,8 +75,8 @@ const StepTax = () => {
 
 	return (
 		<CommonLayout isBgPrimary isCentered>
-			<NewfoldLargeCard>
-				<div className='nfd-onboarding-experience-step'>
+			<NewfoldLargeCard className='ecommerce-step' >
+				<div className='nfd-onboarding-experience-step onboarding-ecommerce-step'>
 					<div className='nfd-card-heading center onboarding-ecommerce-step'>
 						<CardHeader
 							heading={__(content.stepTaxHeading, 'wp-module-onboarding')}
diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/stylesheet.scss b/src/OnboardingSPA/pages/Steps/Ecommerce/stylesheet.scss
index ef87503cc..c609347d8 100644
--- a/src/OnboardingSPA/pages/Steps/Ecommerce/stylesheet.scss
+++ b/src/OnboardingSPA/pages/Steps/Ecommerce/stylesheet.scss
@@ -1,48 +1,56 @@
-.nfd-ecommerce-address-step {
-	@media (max-width: #{($break-medium - 1)}) {
-		width: 70vw;
-		// height: 80vh;
+@media (max-width: #{ ($break-medium - 1) }) {
+	.sm\:col-layout {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		gap: min(1.5em, 24px);
 	}
+}
 
-	.store-address-form {
-		display: grid;
-		gap: 1.5em;
-		grid-template-columns: auto;
-		padding: 1em 0;
+@media (min-width: #{ ($break-medium) }) {
+	.md\:row-layout {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
 	}
+}
 
-	form.onboarding-ecommerce-step {
-		height: 75%;
-		font-size: 1em;
+.ecommerce-step {
+	@media (max-width: 2200px) {
+		height: fit-content;
 	}
+}
+
+.onboarding-ecommerce-step {
+	.nfd-nav-card-button {
+		min-height: 4vh;
+	}
+}
+
+.nfd-ecommerce-address-step {
+	padding: 1rem 0;
 
 	label {
 		display: block;
-		font-size: 1em;
+		font-size: 16px;
+		font-weight: 500;
 		line-height: 1;
 		padding-bottom: 5px;
 	}
 
+	label[data-required="true"]::after {
+		content: " *";
+	}
+
 	input,
 	select {
 		font-size: 1em;
-		padding-left: 17px;
-		width: 300px;
-		min-height: 32px;
+		padding-left: 1.3em;
 		border: 1px solid #d6d6d6;
 		border-radius: 2px;
 	}
 
-	@media (min-width: #{($break-medium)} ) {
-		form.onboarding-ecommerce-step {
-			height: unset;
-		}
-
-		.store-address-form {
-			gap: 24px;
-			grid-template-columns: repeat(2, auto);
-			padding: 48px 0 56px;
-		}
+	@media (min-width: #{ ($break-medium) }) {
 
 		label {
 			font-size: 18px;
@@ -53,25 +61,105 @@
 		select {
 			font-size: 16px;
 			min-height: 48px;
-			width:200px;
+			width: 400px;
 		}
 	}
-	@media (min-width: #{($break-huge)}) {
+
+	@media (max-width: #{ ($break-medium - 1) }) and (min-width: #{ ($break-mobile + 1) }) {
+
 		input,
 		select {
-			font-size: 16px;
-			min-height: 48px;
-			width:400px;
+			min-height: 32px;
+			min-width: 100%;
 		}
 	}
-}
 
-h1.store-address-title {
-	color: var(--wp-admin-theme-color-darker-10);
+	@media (max-width: #{ ($break-mobile) }) {
+
+		input,
+		select {
+			min-height: 32px;
+			max-width: 60vw;
+			min-width: 60vw;
+		}
+	}
+
+	@media (max-width: #{($break-medium - 1)}) {
+		width: 70vw;
+	}
+
+	.store-address-form {
+		display: grid;
+		gap: min(1.5em, 24px);
+		grid-template-columns: auto;
+		padding: 1em 0;
+
+		@media (max-width: #{ ($break-medium - 1) }) {
+			.full-address-fields {
+				width: 100%;
+
+				input,
+				select {
+					width: 100%;
+				}
+			}
+		}
+
+		@media (min-width: #{ ($break-medium) }) {
+			.full-address-fields {
+				width: 80%;
+
+				input,
+				select {
+					width: 140px;
+				}
+			}
+		}
+
+	}
+
+	form.onboarding-ecommerce-step {
+		height: 75%;
+		font-size: 1em;
+
+		.nfd-nav-card-button {
+			width: 80%;
+			margin: 0 10%;
+		}
+	}
+
+	@media (max-width: #{($break-medium)}) {
+		div.onboarding-ecommerce-step {
+			width: 90%;
+		}
+	}
+
+	@media (min-width: #{($break-medium)}) {
+		.onboarding-ecommerce-step {
+			width: 100%;
+		}
+
+		div.onboarding-ecommerce-step {
+			justify-content: space-around;
+		}
+
+		form.onboarding-ecommerce-step {
+			height: unset;
+		}
+
+		.store-address-form {
+			padding: 2em 5%;
+		}
+	}
 }
 
 div.onboarding-ecommerce-step {
 	color: var(--nfd-onboarding-black);
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	justify-content: space-between;
+	gap: 1em;
 
 	h2.nfd-step-card-heading {
 		color: var(--wp-admin-theme-color-darker-10);
@@ -84,23 +172,22 @@ div.onboarding-ecommerce-step {
 }
 
 div.onboarding-product-step {
-	color: var(--nfd-onboarding-black);
 	width: 50vw;
 
+	.nfd-card-need-help-tag {
+		padding: 20px 0 0;
+	}
+
 	div.nfd-product-step-options {
 		display: grid;
 		grid-template-columns: calc((50vw - 15px) / 2) calc((50vw - 15px) / 2);
 		gap: 15px;
 
 		@media (max-width: #{ ($break-mobile)}) {
-			grid-template-columns: repeat(1, 1fr);
+			grid-template-columns: 1fr;
 			gap: 2px;
 		}
 
-		@media (max-height: #{ ($break-small)}) {
-			grid-template-columns: repeat(3, 1fr);
-			gap: 2px;
-		}
 	}
 
 	.components-checkbox-control {
@@ -118,12 +205,29 @@ div.onboarding-product-step {
 	}
 
 	.step-product-numbers {
-		display: flex;
+		display: grid;
 		width: 100%;
-		align-items: center;
+		margin: 0.5em 0;
+
+		&>* {
+			align-self: center;
+		}
+
+		@media (min-width: #{ ($break-xlarge + 100)}) {
+			gap: 1em;
+			grid-template-columns: auto max-content;
+
+			&>* {
+				align-self: baseline;
+			}
+
+			.components-radio-control {
+				margin-left: auto;
+			}
+		}
 
 		.components-radio-control {
-			margin-left: auto;
+			align-items: normal;
 
 			.components-base-control__field {
 				display: flex;
@@ -133,9 +237,17 @@ div.onboarding-product-step {
 				}
 			}
 
+			.components-radio-control__option {
+				margin: 1em 1em 1em 0;
+
+				@media (min-width: #{ ($break-xlarge + 100)}) {
+					margin: 0 1em 0 0;
+				}
+			}
+
+
 			label {
 				padding: 10px;
-				margin: 10px;
 				border: 1px solid #DBDBDB;
 				cursor: pointer;
 			}
@@ -152,4 +264,20 @@ div.onboarding-product-step {
 	label {
 		padding: 10px 190px 10px 15px;
 	}
+
+	@media (max-width: #{ ($break-medium - 1) }) {
+		label {
+			padding-right: 15px;
+		}
+	}
+
+	@media (max-width: 480px) {
+		label {
+			padding: clamp(10px, 1.5vh, 15px) clamp(10px, 5%, 13px) clamp(10px, 5%, 13px);
+			width: unset;
+			height: fit-content;
+			line-height: 1.5;
+			white-space: normal;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js
index 7730415ec..5e8c3daf9 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/index.js
@@ -83,13 +83,11 @@ const GetStartedExperience = () => {
 						} ) }
 						onChange={ ( value ) => setWpComfortLevel( value ) }
 					/>
-					<div>
-						<NavCardButton
-							text={__(content.buttonText, 'wp-module-onboarding')}
-							disabled={wpComfortLevel == '0'}
-						/>
-						<NeedHelpTag />
-					</div>
+					<NavCardButton
+								text={__(content.buttonText, 'wp-module-onboarding')}
+								disabled={wpComfortLevel == '0'}
+							/>
+					<NeedHelpTag />
 				</div>
 			</NewfoldLargeCard>
 		</CommonLayout>
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/stylesheet.scss
index 26ed9029c..7f0671c5c 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/stylesheet.scss
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/stylesheet.scss
@@ -2,26 +2,27 @@
 	display: flex;
 	align-items: center;
 	width: 100%;
-	height: 100%;
 	flex-direction: column;
-	justify-content: space-around;
 
 	&-tabs label {
-		width: 14vw;
-		height: 4vh;
 		border: 1px solid var(--nfd-onboarding-light-gray-2);
 		display: flex;
 		justify-content: flex-start;
-		padding: 1% 10%;
+		padding: 10px 190px 10px 15px;
 		color: var(--nfd-onboarding-black);
 		background: var(--nfd-onboarding-light-gray);
 		font-weight: 350;
 		font-size: clamp(0.8rem, 1.5vw, 1.2rem);
-		line-height: 4vh;
-		margin: 0.5vh;
+		line-height: 1.5;
+		margin: 5px;
 		white-space: nowrap;
-		@media (max-width: 650px) {
-			width: 25vw;
+		@media (max-width: #{ ($break-medium) - 1 }) {
+			padding-right: 100px;
+		}
+		@media (min-width: 3700px) {
+			font-size: clamp(3.7rem, -0.27vw + 3.5rem, 3rem);
+			margin: 25px;
+			font-weight: 360;
 		}
 	}
 
@@ -30,15 +31,12 @@
 		background: var(--wp-admin-theme-color-darker-10);
 		border: none;
 	}
-}
 
-.nfd-exp-continue-button {
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	justify-content: center;
-}
-
-.components-radio-control__input input {
-	display: none !important;
-}
+	.components-radio-control {
+		&__input input {
+		display: none !important;
+		}
+		margin: 20px 0px 60px;
+		align-items: center;
+	}
+}
\ No newline at end of file
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss
index a607024f9..745e77ee8 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/PrimarySite/stylesheet.scss
@@ -30,12 +30,14 @@
 		align-items: center;
 		flex-direction: column;
 		justify-content: space-around;
-
-		&-top {
-		}
+		width: 100%;
 
 		&-bottom {
 			margin-top: 20px;
+			width: 100%;
+			display: flex;
+			flex-flow: column;
+			align-items: center;
 		}
 	}
 }
@@ -48,7 +50,6 @@
 	display: inline-flex;
 	margin: auto 0rem 1rem 1rem;
 	border-radius: 2.5rem;
-	height: 10px;
 	cursor: pointer;
 	align-items: center;
 }
@@ -57,8 +58,8 @@
 	color: var(--nfd-onboarding-black);
 	font-size: 1rem;
 	font-weight: 700;
-	margin-top: 1.3rem;
 	text-align: center;
+	padding: 10px;
 }
 
 .tellUsInput {
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js
index 6de824c18..a2dbdc4bb 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/index.js
@@ -66,7 +66,7 @@ const StepPrimarySetup = () => {
 
 	return (
 		<CommonLayout isBgPrimary isCentered>
-			<NewfoldLargeCard className={'site-type-card'}>
+			<NewfoldLargeCard>
 				<div className="nfd-card-heading center">
 					<CardHeader
 						heading={__(currentStep?.heading, 'wp-module-onboarding')}
@@ -99,7 +99,7 @@ const StepPrimarySetup = () => {
 
 				<div className='nfd-setup-primary-second'>
 					<div className='nfd-setup-primary-second-top'>
-						<p className='blackText'>{__(content.tellusHereText, 'wp-module-onboarding')}</p>
+						<div className='blackText'>{__(content.tellusHereText, 'wp-module-onboarding')}</div>
 						<input
 							type="text"
 							onChange={(e) => categoryInput(e)}
@@ -108,14 +108,11 @@ const StepPrimarySetup = () => {
 							value={inputCategVal}
 						/>
 					</div>
-					<div className='nfd-setup-primary-second-bottom'>
-						<NavCardButton
-							text={__(content.buttonText)}
-						/>
-						<NeedHelpTag />
-					</div>
 				</div>
-				
+				<NavCardButton
+					text={__(content.buttonText)}
+				/>
+				<NeedHelpTag />
 			</NewfoldLargeCard>
 		</CommonLayout>
 	);
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss
index 3e5291463..c300bce9c 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/SiteTypeSetup/SecondarySite/stylesheet.scss
@@ -1,16 +1,3 @@
-.nfd-onboarding-large-card {
-	margin: 1vh 1vh;
-	@media (max-width: #{ ($break-medium - 1) })  {
-		padding: 20px;
-		margin: 5vh;
-	}
-	
-	@media (max-width: 2200px) {
-		&.site-type-card {
-			height: fit-content;
-		}
-	}
-}
 .nfd-setup-secondary {
 	&-categories {
 			width: 47vw;
@@ -77,9 +64,6 @@
 		flex-direction: column;
 		justify-content: space-around;
 
-		&-top {
-		}
-
 		&-bottom {
 			margin-top: 20px;
 		}
diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/stylesheet.scss b/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/stylesheet.scss
index 79480988f..bb8a0a71d 100644
--- a/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/stylesheet.scss
+++ b/src/OnboardingSPA/pages/Steps/GetStarted/Welcome/stylesheet.scss
@@ -24,7 +24,7 @@
     }
 
     &__tab-panel {
-        width: 85%;
+        width: 90%;
         padding-bottom: 40px;
         color: var(--nfd-onboarding-dark);
     }
@@ -37,6 +37,9 @@
 
 .components-tab-panel__tabs {
     justify-content: space-around;
+	@media screen and ( max-width: 480px ) {
+        width: 100%;
+    }
 }
 
 .components-tab-panel__tabs > .components-button:focus:not(:disabled),
@@ -48,7 +51,8 @@
     justify-content: center;
     border-bottom: 1px solid #CCCCCC;
     width: 100%;
-    font-size: clamp(0.5rem, 1vw, 1rem);
+    font-size: clamp(0.55rem, 1vw + 0.3rem, 1rem);
+    line-height: 1.5;
 
     &.is-active {
         color: var(--wp-admin-theme-color);
@@ -62,23 +66,26 @@
 
 .tab-data{
     width: 100%;
-    margin-top: 20px;
+    padding-top: 40px;
     display: flex;
     flex-direction: row;
     align-items: stretch;
     justify-content: space-around;
+    
 }
 
 .content-text{
     padding-right: 10px;
-    font-size: clamp(0.7rem, 1vw, 1rem);
+    font-size:  clamp(0.88rem, 0.45rem + 0.76vw, 1.13rem);
+    line-height: 1.6;
+    width: 390px;
 }
 
 .content-img{
     background-image: var(--get-started-content-img);
     background-size: contain;
     background-repeat: no-repeat;
-    height: 150px;
+    height: 200px;
     width: 350px;
 }
 
@@ -86,7 +93,7 @@
     background-image: var(--get-started-features-img);
     background-size: contain;
     background-repeat: no-repeat;
-    height: 150px;
+    height: 200px;
     width: 350px;
 }
 
@@ -94,7 +101,7 @@
     background-image: var(--get-started-design-img);
     background-size: contain;
     background-repeat: no-repeat;
-    height: 150px;
+    height: 200px;
     width: 350px;
 }
 
@@ -106,4 +113,23 @@
     height: 100%;
     width: 100%;
     padding-bottom: 10px;
-}
\ No newline at end of file
+}
+
+
+@media screen and ( max-width: #{ ($break-medium)} ) {
+    .tab-data {
+        flex-direction: column-reverse;
+        align-items: center;
+    }
+
+    .content-text {
+        text-align: center;
+        width: 100%;
+        min-height: 10px;
+    }
+
+    .content-img, .design-img, .features-img {
+        max-height: 100px;
+        max-width: 180px;
+    }
+}