diff --git a/pages/admin.js b/pages/admin.js
index 3051b98..dc39152 100644
--- a/pages/admin.js
+++ b/pages/admin.js
@@ -1576,7 +1576,7 @@ export class Admin {
      * @return nothing returns
      */
     enableRandomlyGenerated(){
-	    cy.xpath('(//label[@class="custom-control-label"])[1]').should('be.visible').click();
+        cy.xpath('(//label[@class="custom-control-label"])[1]').should('be.visible').click();
     }
 
     /**
diff --git a/pages/execution.js b/pages/execution.js
index 90a57e4..bde1423 100644
--- a/pages/execution.js
+++ b/pages/execution.js
@@ -3370,14 +3370,14 @@ export class Execution {
         cy.get('h5').eq(0).should('have.text','Active Columns');
         cy.get('h5').eq(1).should('have.text','Available Columns');
         //verify active column
-        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',9);
+        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',10);
         //verify available column
         cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',4);
         //move element
         cy.get(':nth-child(2) > .border > :nth-child(1) > .column-card > .d-flex').drag('div[class="border bg-muted px-3 draggable-list draggable-current"]');
         cy.get(':nth-child(2) > .border > :nth-child(1) > .column-card > .d-flex').drag('div[class="border bg-muted px-3 draggable-list draggable-current"]');
         //verify active column
-        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',11);
+        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',12);
         //verify available column
         cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',2);
         cy.get('.mt-3 > .d-flex > .btn-secondary')
@@ -3400,9 +3400,9 @@ export class Execution {
         cy.wait(5000);
         cy.xpath('//div[@class="border bg-muted px-3 draggable-list draggable-available"]//div/span[text()="Line 1"]').should('have.text','Line 1');
         //verify active column
-        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',9);
+        cy.get('div[class="border bg-muted px-3 draggable-list draggable-current"] > div').should('have.length',10);
         //verify available column
-        cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',3);
+        cy.get('div[class="border bg-muted px-3 draggable-list draggable-available"] > div').should('have.length',4);
         cy.get('.mt-3 > .d-flex > .btn-secondary').click();
         cy.get('.mt-3 > .d-flex > .btn-outline-secondary').click();
     }
@@ -6459,7 +6459,7 @@ export class Execution {
         cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
         cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
         cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
-        cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
+        //cy.get("div [class='border bg-muted px-3 draggable-list draggable-available'] :nth-child(11) > .column-card").drag(".mr-3 > .border");
         cy.xpath('//*[@id="nav-columns"]//button[2]').click({ force: true });
     }
     waitUntilcardBodyIsVisible(selectorXPath,maxAttempts=10, attempts=0){
diff --git a/pages/saveSearch.js b/pages/saveSearch.js
index d377244..6152b33 100644
--- a/pages/saveSearch.js
+++ b/pages/saveSearch.js
@@ -121,10 +121,10 @@ export class SaveSearchs {
             .should('be.visible')
             .click();
         
-        cy.get(':nth-child(3) > .btn')
-            .first()
-            .should('be.visible')
-            .click();
+        // cy.get(':nth-child(3) > .btn')
+        //     .first()
+        //     .should('be.visible')
+        //     .click();
     }
     //Configurations
     configurationsSaveSearch() {
@@ -139,7 +139,7 @@ export class SaveSearchs {
             .click();
     }
 
-   /**
+    /**
     This method creates a Save Search from Request > Save Search
      * @param name: Assign a name for the Save Search
      * @param iconName: the correct name must be assigned. E.g. iconName: clipboard because the class="fas fa-fw fa-clipboard"
@@ -148,13 +148,13 @@ export class SaveSearchs {
      * @param completeUserName: this name is needed because the user will be selected in the User list 
      * @return: nothing value
     */
-    createSaveSearch(name,iconName, userName="", groupName="", completeUserName=""){
+    createSaveSearch(name, iconName, userName="", groupName="", completeUserName="", buttonName = "Save"){
         cy.get('button[title="Save Search"]').should('be.visible');
         cy.get('button[title="Save Search"]').click();
         cy.get('[aria-label="Close"]')
             .first()
             .click();
-       cy.get('button[title="Save Search"]').click();
+        cy.get('button[title="Save Search"]').click();
         cy.xpath('//legend[text()="Share With Users"]/parent::fieldset//div[@class="multiselect__spinner"]').should('not.be.visible');
         cy.xpath('//legend[text()="Share With Groups"]/parent::fieldset//div[@class="multiselect__spinner"]').should('not.be.visible');
         cy.xpath("//label[contains(text(),'Name')]/parent::div//input").should('be.visible');
@@ -174,7 +174,7 @@ export class SaveSearchs {
             cy.xpath('//legend[text()="Share With Groups"]//following-sibling::div//div[@class="multiselect__content-wrapper"]/ul/li/span/span').should('have.text',groupName);
             cy.xpath('//legend[text()="Share With Groups"]//following-sibling::div//div[@class="multiselect__content-wrapper"]/ul/li/span/span').click();
         }
-        cy.xpath('//footer[@id="save-search-modal___BV_modal_footer_"]/button[text()="Save"]').click(); 
+        cy.xpath('//footer[@id="save-search-modal___BV_modal_footer_"]/button[text()="'+buttonName+'"]').click(); 
     }
 
     enableNotification(){
@@ -275,16 +275,16 @@ export class SaveSearchs {
         cy.xpath(selectors.clickOnSourceOptn).click();
         cy.xpath(selectors.clickOnSeriesDrpDwn).should('be.visible');
         cy.xpath(selectors.clickOnSeriesDrpDwn).click();
-        cy.xpath(selectors.clickOnSeriesInptBx).type(series,{delay:100});
-        cy.xpath(selectors.clickOnSeriesValue.replace('name',series))
-            .should('be.visible')
-            .click();
+        cy.xpath(selectors.clickOnSeriesInptBx).type(series + "{enter}",{delay:100});
+        // cy.xpath(selectors.clickOnSeriesValue.replace('name',series))
+        //     .should('be.visible')
+        //     .click();
         cy.wait(2000);
         cy.xpath(selectors.clickOnMetricDrpDwn).click();
-        cy.xpath(selectors.clickOnMetricInptBx).type(metric,{delay:100});
-        cy.xpath(selectors.clickOnMetricValue.replace('name',metric))
-        .should('be.visible')
-        .click();
+        cy.xpath(selectors.clickOnMetricInptBx).type(metric + "{enter}",{delay:100});
+        // cy.xpath(selectors.clickOnMetricValue.replace('name',metric))
+        // .should('be.visible')
+        // .click();
         cy.wait(2000);
         cy.xpath(selectors.clickOnSumBtn).click();
         switch(metric_type){
diff --git a/pages/screens.js b/pages/screens.js
index 3ec68be..0c66c22 100644
--- a/pages/screens.js
+++ b/pages/screens.js
@@ -497,16 +497,17 @@ export class Screens {
 			cy.log(el.text());
 			//if (el.text().includes("No Data Available")) { //This message doesn't display anymore
 			cy.get('table tbody').then($tbody => {
-  				if ($tbody.is(':empty')) {
-			    	cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
-			  	}else{
+				if ($tbody.is(':empty')) {
+				cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
+				}else{
 					cy.get('[data-cy="screens-table-td-0-0"] span').then((row)=>{
 						if(!(row.text()===screenName)){
 							cy.get(Selectors.searchInputBox).first().clear().type(screenName, { delay: 1}).type(" ",{ delay: 600}).type("{backspace}").type(" ").type("{backspace}").should('have.value', screenName);
 						}
-					  })
-				  }
+					})
+				}
 			});
+		});
 	}
 
 	clickOnEditScreen(screenName) {