diff --git a/package-lock.json b/package-lock.json
index 1fef27ec12..864584c7db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,6 +80,7 @@
 				"memcached": "^2.2.2",
 				"memjs": "^1.2.2",
 				"minimist": "^1.2.6",
+				"mitt": "^3.0.1",
 				"numeral": "^2.0.6",
 				"passport": "^0.7.0",
 				"passport-auth0": "^1.4.4",
@@ -26879,6 +26880,12 @@
 				"node": ">=4.0.0"
 			}
 		},
+		"node_modules/mitt": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+			"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+			"license": "MIT"
+		},
 		"node_modules/mixin-deep": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -57232,6 +57239,11 @@
 				"through2": "^2.0.0"
 			}
 		},
+		"mitt": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+			"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+		},
 		"mixin-deep": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
diff --git a/package.json b/package.json
index 6f0569e005..4c461b54bd 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 		"start": "cross-env NODE_ENV=production node --max-old-space-size=2048 server/index.js",
 		"start-k8s": "cross-env NODE_ENV=production node --max-old-space-size=1536 server/index.js",
 		"docker-dev-vm": "rimraf node_modules/.cache/hard-source && cross-env NODE_ENV=development node server/dev-server.js",
-		"inspect-dev": "cross-env NODE_ENV=development node --inspect --max-old-space-size=4096 server/dev-server.js",
+		"inspect-dev": "cross-env NODE_ENV=development TAILWIND_MODE=watch node --inspect --max-old-space-size=4096 server/dev-server.js",
 		"inspect": "cross-env NODE_ENV=production node --inspect --max-old-space-size=4096 server/index.js",
 		"build": "npm run build:all",
 		"build:all": "rimraf dist && npm run build:client && npm run build:server",
@@ -107,6 +107,7 @@
 		"memcached": "^2.2.2",
 		"memjs": "^1.2.2",
 		"minimist": "^1.2.6",
+		"mitt": "^3.0.1",
 		"numeral": "^2.0.6",
 		"passport": "^0.7.0",
 		"passport-auth0": "^1.4.4",
diff --git a/src/components/Contentful/ButtonWrapper.vue b/src/components/Contentful/ButtonWrapper.vue
index 67c210f923..6ac1bad504 100644
--- a/src/components/Contentful/ButtonWrapper.vue
+++ b/src/components/Contentful/ButtonWrapper.vue
@@ -12,6 +12,7 @@
 
 <script>
 import KvButton from '@kiva/kv-components/vue/KvButton';
+import emitter from '#src/plugins/event-emitter';
 
 /**
 * Contentful Button Wrapper
@@ -57,8 +58,8 @@ export default {
 			if (customEventName) {
 				// Current behavior is to replace a button navigation if a custom event name is passed
 				event.stopPropagation();
-				// Emit root level event that any component can listen for
-				this.$root.$emit(customEventName);
+				// Emit event that any component can listen for using the event-emitter plugin
+				emitter.emit(customEventName, { eventName: customEventName, event });
 			}
 		},
 	}
diff --git a/src/components/WwwFrame/TheBasketBar.vue b/src/components/WwwFrame/TheBasketBar.vue
index eed191e1d4..363f901d77 100644
--- a/src/components/WwwFrame/TheBasketBar.vue
+++ b/src/components/WwwFrame/TheBasketBar.vue
@@ -69,7 +69,7 @@ export default {
 	},
 	computed: {
 		basketLink() {
-			return this.corporate ? this.addHashToRoute('show-basket') : '/basket';
+			return this.corporate ? this.addHashToRoute('#show-basket') : '/basket';
 		},
 		hideBasketBar() {
 			// hide this banner on managed lending landing + checkout pages
diff --git a/src/pages/LandingPages/CorporateCampaign/CCLandingPage.vue b/src/pages/LandingPages/CorporateCampaign/CCLandingPage.vue
index 5fa6d8d032..7be778d341 100644
--- a/src/pages/LandingPages/CorporateCampaign/CCLandingPage.vue
+++ b/src/pages/LandingPages/CorporateCampaign/CCLandingPage.vue
@@ -226,6 +226,7 @@ import LoanSearchFilters, { getSearchableFilters } from '#src/api/fixtures/LoanS
 import syncDate from '#src/util/syncDate';
 import trackTransactionEvent from '#src/util/trackTransactionEvent';
 import checkoutUtils from '#src/plugins/checkout-utils-mixin';
+import emitter from '#src/plugins/event-emitter';
 import updateLoanReservationTeam from '#src/graphql/mutation/updateLoanReservationTeam.graphql';
 import CampaignHowKivaWorks from '#src/components/CorporateCampaign/CampaignHowKivaWorks';
 import CampaignJoinTeamForm from '#src/components/CorporateCampaign/CampaignJoinTeamForm';
@@ -709,6 +710,11 @@ export default {
 		// show a loading screen if the page loads with an loan in the basket.
 		// const basketItems = this.rawPageData?.shop?.basket?.items?.values ?? [];
 		this.loadingPage = basketItems.some(item => item.__typename === 'LoanReservation'); // eslint-disable-line no-underscore-dangle, max-len
+
+		// setup emitter watcher
+		emitter.on('jumpToLoans', () => {
+			this.jumpToLoans();
+		});
 	},
 	async mounted() {
 		this.isClientReady = typeof window !== 'undefined';
@@ -765,9 +771,6 @@ export default {
 		}
 	},
 	computed: {
-		loanDisplayComponent() {
-			return this.$refs?.mlLoanDisplay?.$refs || this.$refs?.mlLoanDisplay?.[0]?.$refs;
-		},
 		campaignLoanWrapperProps() {
 			return {
 				filters: this.filters,
@@ -1502,16 +1505,23 @@ export default {
 				this.basketBalancing = false;
 			}
 		},
-		checkoutLightboxClosed() {
+		async checkoutLightboxClosed() {
 			this.checkoutVisible = false;
+			// gaurd against navigation reset if hash is already empty
+			if (this.$router?.hash !== '') {
+				await this.$router.push(this.adjustRouteHash('')).catch(() => {});
+			}
 			this.handleScrollPosition();
-			this.$router.push(this.adjustRouteHash('')).catch(() => {});
+		},
+		getLoanSectionRef() {
+			const refs = this.$refs;
+			return refs?.mlLoanDisplay?.$refs || refs?.mlLoanDisplay?.[0]?.$refs;
 		},
 		handleScrollPosition(y) {
 			if (this.scrollToLoans) {
-				this.scrollToLoans = false;
-				this.loanDisplayComponent.campaignLoanSection.scrollIntoView({ behavior: 'smooth' });
-			} else if (y) {
+				// Fetch Current Refs using method above and Navigate using the result
+				this.getLoanSectionRef()?.campaignLoanSection?.scrollIntoView({ behavior: 'smooth' });
+			} else if (typeof y !== 'undefined') {
 				window.scrollTo(0, y);
 			}
 		},
@@ -1637,7 +1647,6 @@ export default {
 		jumpToLoans() {
 			this.scrollToLoans = true;
 			this.checkoutLightboxClosed();
-			this.handleScrollPosition();
 		},
 		adjustRouteHash(hash) {
 			const route = { ...this.$route };
diff --git a/src/plugins/event-emitter.js b/src/plugins/event-emitter.js
new file mode 100644
index 0000000000..371857e0a5
--- /dev/null
+++ b/src/plugins/event-emitter.js
@@ -0,0 +1,6 @@
+import mitt from 'mitt';
+
+// eslint-disable-next-line new-cap
+const emitter = new mitt();
+
+export default emitter;
diff --git a/vite.config.js b/vite.config.js
index f8e5dca0e7..97b193d853 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -49,6 +49,7 @@ export default defineConfig(({ isSsrBuild, mode }) => {
 				// vite default
 				return size <= 4096;
 			},
+			sourcemap: !isProd,
 		},
 		css: {
 			postcss: {