diff --git a/Ginger/Ginger/Agents/AgentEditPage.xaml.cs b/Ginger/Ginger/Agents/AgentEditPage.xaml.cs
index 9f1f54ae80..cd56d380d9 100644
--- a/Ginger/Ginger/Agents/AgentEditPage.xaml.cs
+++ b/Ginger/Ginger/Agents/AgentEditPage.xaml.cs
@@ -110,16 +110,7 @@ public AgentEditPage(Agent agent, bool isReadOnly = false, bool ignoreValidation
                 }
                 if (mAgent.AgentType == eAgentType.Driver)
                 {
-                    if (mAgent.DriverType == eDriverType.Selenium)
-                    {
-                        xAgentConfigFrame.SetContent(new WebAgentConfigEditPage(mAgent));
-                    }
-                    else
-                    {
-                        xAgentConfigFrame.SetContent(new AgentDriverConfigPage(mAgent, _viewMode));
-                    }
-                   
-                   
+                    xAgentConfigFrame.SetContent(new AgentDriverConfigPage(mAgent, _viewMode));
                 }
                 else
                 {
diff --git a/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml b/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml
index 026263833c..9b6fb05f8b 100644
--- a/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml
+++ b/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml
@@ -11,9 +11,7 @@
     <Grid  x:Name="xPageGrid" Grid.IsSharedSizeScope="True"   Background="{StaticResource $BackgroundColor_White}">
         
 
-        <TabControl >
-            <TabItem Header="Configurations" Style="{StaticResource $RoundedTab}">
-                <StackPanel Orientation="Vertical" Margin="5,5,0,0">
+    <StackPanel Orientation="Vertical" Margin="5,5,0,0">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
@@ -300,8 +298,6 @@
 
                     
                     
-                </StackPanel>
-            </TabItem>
-           </TabControl>
+                </StackPanel>            
     </Grid>
 </Page>
diff --git a/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml.cs b/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml.cs
index 53cdb2ce98..4150e0eb3a 100644
--- a/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml.cs
+++ b/Ginger/Ginger/Drivers/DriversConfigsEditPages/WebAgentConfigEditPage.xaml.cs
@@ -56,7 +56,7 @@ public WebAgentConfigEditPage(Agent mAgent)
             this.mAgent = mAgent;
             InitializeComponent();
 
-            bindElement();
+            BindElement();
 
             DriverConfigParam? browserTypeParam = mAgent.DriverConfiguration.FirstOrDefault(p => string.Equals(p.Parameter, nameof(GingerWebDriver.BrowserType)));
             if (browserTypeParam != null)
@@ -64,17 +64,17 @@ public WebAgentConfigEditPage(Agent mAgent)
                 browserTypeParam.PropertyChanged += BrowserTypeParam_PropertyChanged;
             }
             WebBrowserType browserType = Enum.Parse<WebBrowserType>(browserTypeParam?.Value);
-            edgeIEPnlVisibility(browserType);
-            chromePnlvisibilitly(browserType);
-            chromeFirefoxPnlVisibility(browserType);
-            allBrowserNotBravePnl(browserType);
-            proxyPnlVisbility();
+            EdgeIEPnlVisibility(browserType);
+            ChromePnlvisibilitly(browserType);
+            ChromeFirefoxPnlVisibility(browserType);
+            AllBrowserNotBravePnl(browserType);
+            ProxyPnlVisbility();
         }
 
         /// <summary>
         /// Binds the elements of the page.
         /// </summary>
-        void bindElement()
+        void BindElement()
         {
 
             #region ProxyConfigration
@@ -288,8 +288,7 @@ void bindElement()
 
             if (!string.IsNullOrEmpty(proxyName.Value))
             {
-                autoDetect.Value = "False";
-                BindingHandler.ObjFieldBinding(xAutoDetectProxyCB, CheckBox.IsCheckedProperty, autoDetect, nameof(DriverConfigParam.Value));
+                xAutoDetectProxyCB.IsChecked= false;
             }
         }
 
@@ -316,17 +315,17 @@ private void BrowserTypeParam_PropertyChanged(object? sender, PropertyChangedEve
             }
 
             WebBrowserType browserType = Enum.Parse<WebBrowserType>(driverConfigParam.Value);
-            edgeIEPnlVisibility(browserType);
-            chromePnlvisibilitly(browserType);
-            chromeFirefoxPnlVisibility(browserType);           
-            allBrowserNotBravePnl(browserType);
+            EdgeIEPnlVisibility(browserType);
+            ChromePnlvisibilitly(browserType);
+            ChromeFirefoxPnlVisibility(browserType);           
+            AllBrowserNotBravePnl(browserType);
         }
 
         /// <summary>
         /// Sets the visibility of the Edge/IE panel based on the specified browser type.
         /// </summary>
         /// <param name="result">The browser type.</param>
-        void allBrowserNotBravePnl(WebBrowserType result)
+        void AllBrowserNotBravePnl(WebBrowserType result)
         {
 
 
@@ -346,7 +345,7 @@ void allBrowserNotBravePnl(WebBrowserType result)
         /// Sets the visibility of the Edge/IE panel based on the specified browser type.
         /// </summary>
         /// <param name="result">The browser type.</param>
-        void edgeIEPnlVisibility(WebBrowserType result)
+        void EdgeIEPnlVisibility(WebBrowserType result)
         {
 
 
@@ -365,7 +364,7 @@ void edgeIEPnlVisibility(WebBrowserType result)
         /// Sets the visibility of the Chrome panel based on the specified browser type.
         /// </summary>
         /// <param name="result">The browser type.</param>
-        void chromePnlvisibilitly(WebBrowserType result)
+        void ChromePnlvisibilitly(WebBrowserType result)
         {
             if (result == WebBrowserType.Chrome|| result==WebBrowserType.Brave)
             {
@@ -382,7 +381,7 @@ void chromePnlvisibilitly(WebBrowserType result)
         /// Sets the visibility of the Chrome/Firefox panel based on the specified browser type.
         /// </summary>
         /// <param name="result">The browser type.</param>
-        void chromeFirefoxPnlVisibility(WebBrowserType result)
+        void ChromeFirefoxPnlVisibility(WebBrowserType result)
         {
             if (result == WebBrowserType.Chrome || result == WebBrowserType.FireFox || result == WebBrowserType.Brave)
             {
@@ -398,7 +397,7 @@ void chromeFirefoxPnlVisibility(WebBrowserType result)
         /// </summary>
         /// <param name="result">The browser type.</param>    
        
-       void proxyPnlVisbility()
+       void ProxyPnlVisbility()
         {
             if (xAutoDetectProxyCB.IsChecked == false)
             {
@@ -412,7 +411,7 @@ void proxyPnlVisbility()
         }
         private void xAutoDetectProxyCB_Click(object sender, RoutedEventArgs e)
         {
-            proxyPnlVisbility();
+            ProxyPnlVisbility();
             xProxyVE.ValueTextBox.Text = "";
         }
     }
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
index 53393d363b..0089acecb1 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -167,6 +167,10 @@ public override string GetDriverConfigsEditPageName(Agent.eDriverType driverSubT
             {
                 return "SeleniumRemoteWebDriverEditPage";
             }
+            else if (browserType == WebBrowserType.Chrome|| browserType == WebBrowserType.Brave || browserType == WebBrowserType.Edge || browserType == WebBrowserType.InternetExplorer || browserType == WebBrowserType.FireFox )
+            {
+                return "WebAgentConfigEditPage";
+            }
             else
             {
                 return null;