diff --git a/playwright-tests/pages/HomePage.ts b/playwright-tests/pages/HomePage.ts
index 39e349790..3d44b023a 100644
--- a/playwright-tests/pages/HomePage.ts
+++ b/playwright-tests/pages/HomePage.ts
@@ -47,7 +47,7 @@ export class HomePage extends BasePage {
 
         //Zip Entry
         this.enterServiceZipTextBox = this.page.locator('#zipCodeTextbox');
-        this.zipEntryLetsGetStartedButton = this.page.locator('#zipCodeTextboxButton');
+        this.zipEntryLetsGetStartedButton = this.page.locator('#zipCodeTextbox');
         this.getQuoteAndScheduleButton = this.page.getByLabel('main').getByRole('link', { name: 'Get quote + schedule' });
     }
 
@@ -61,10 +61,11 @@ export class HomePage extends BasePage {
 
     async letsGetStarted(zip: string, enterFunnelWithZip: boolean) {
         if (enterFunnelWithZip) {
-            await this.letsGetStartedButton.evaluate((element, zip) => {
+            await this.zipEntryLetsGetStartedButton.fill(zip);
+            /* await this.letsGetStartedButton.evaluate((element, zip) => {
                 const currentHref = element.getAttribute('href') || '';
-                element.setAttribute('href', `${currentHref}&zipCode=${zip}`);
-            }, zip);
+                element.setAttribute('href', `${currentHref}?zipCode=${zip}`);
+            }, zip);*/
         }
 
         // Wait until modal pop up opens and close pop up
diff --git a/playwright-tests/pages/PaypalPage.ts b/playwright-tests/pages/PaypalPage.ts
index ce5547f3c..e67e0a57b 100644
--- a/playwright-tests/pages/PaypalPage.ts
+++ b/playwright-tests/pages/PaypalPage.ts
@@ -41,6 +41,8 @@ export class PaypalPage extends BasePage {
             await this.paypalLoginButton.click();
             await this.completePurchaseButton.click();
         } else {
+            await this.usernameTextBox.waitFor({ state: 'visible' });
+            await this.page.screenshot({ path: `test-results\\ortoni-data\\paypal-username-${Date.now()}.png`, fullPage: true });
             await this.usernameTextBox.fill(paymentDetails.username!);
             await this.nextButton.click();
             await this.tryAnotherWayButton.click();
diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts
index 77b330aff..944b84136 100644
--- a/playwright-tests/pages/SchedulePage.ts
+++ b/playwright-tests/pages/SchedulePage.ts
@@ -35,6 +35,7 @@ export class SchedulePage extends BasePage {
     readonly timeSlots: Locator;
     readonly allDayDropOffButton: Locator;
     readonly pickATimeButton: Locator;
+    readonly mobileFirstModalCloseButton: Locator;
 
     constructor(page: Page) {
         super(page);
@@ -65,6 +66,7 @@ export class SchedulePage extends BasePage {
         this.viewMoreDatesLink = this.page.getByText(/View more dates/).first();
         this.appointmentDuration = this.page.locator('.duration-text-block');
         this.timeSlots = this.page.locator('fieldset:has(>legend#chooseTimeSlot) label').filter({ visible: true});
+        this.mobileFirstModalCloseButton = this.page.getByRole('dialog').getByRole('button', { name: 'Close' });
     }
 
     async selectLocation(testData: Partial<ITestData>) {
@@ -229,6 +231,9 @@ export class SchedulePage extends BasePage {
     async handleSchedulePage(testData: Partial<ITestData>) {
         const { appointmentDetails } = testData;
         await this.validateProgressBar(ProgressBarPercentages.SchedulePage);
+        if (await this.mobileFirstModalCloseButton.isVisible()) {
+            await this.mobileFirstModalCloseButton.click();
+        }
         await this.selectLocation(testData);
         await this.scheduleFirstAppointment(testData);
         await this.nextPage();
diff --git a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
index f488a3555..4042c67de 100644
--- a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
+++ b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
@@ -35,7 +35,7 @@ const cashReplaceMultiSlidingGlassDropoffData: Partial<ITestData> = {
     appointmentDetails: {
         serviceLocation: ServiceLocation.DropOff,
         appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate,
-        shopAddress: "6826 sawmill rd, Columbus, OH 43235"
+        shopAddress: "1343 cameron ave, lewis center, oh 43035"
     },
    
     // Override vehicle details