diff --git a/package-lock.json b/package-lock.json
index 1049165..b9d622f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@wavemaker/rest-client-ui",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@wavemaker/rest-client-ui",
-      "version": "0.0.18",
+      "version": "0.0.19",
       "dependencies": {
         "@babel/runtime-corejs3": "^7.22.6",
         "@braintree/sanitize-url": "=6.0.2",
diff --git a/package.json b/package.json
index c966a9b..69d31aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/rest-client-ui",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "private": false,
   "main": "./dist/core/components/RestImport.js",
   "release": {
diff --git a/src/App.tsx b/src/App.tsx
index 3160827..358e7f0 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -53,7 +53,10 @@ export default function App() {
     monacoEditorURL: undefined as any,
     responseBlockHeight: 550,
     urlBasePath:"",
-    settingsDetailsResponse: {}
+    settingsDetailsResponse: {},
+    handleUpdateSwaggerResponse: (updateSwaggerResponse) =>{
+      console.log(updateSwaggerResponse)
+    }
   }
 
   return (
diff --git a/src/core/components/RestImport.tsx b/src/core/components/RestImport.tsx
index e36b24a..d13728f 100644
--- a/src/core/components/RestImport.tsx
+++ b/src/core/components/RestImport.tsx
@@ -79,6 +79,7 @@ export interface restImportConfigI {
     getUseProxy: (value: boolean) => void,
     urlBasePath :string,
     settingsDetailsResponse : any
+    handleUpdateSwaggerResponse: (updateSwaggerResponse: any) =>void
 }
 export interface ICustomAxiosConfig extends AxiosRequestConfig {
     useProxy?: boolean,
@@ -304,8 +305,6 @@ export default function RestImport({ language, restImportConfig }: { language: s
     const [basePathList, setBasePathList] = useState<string[]>([]);
     const [basePathEnabled, setBasePathEnabled] = useState(!restImportConfig?.viewMode)
     const [settingsDetailsResponse, setSettingsDetailsResponse] = useState(restImportConfig?.settingsDetailsResponse || {})
-    const [handleRes, setHandleRes] =useState<any>()
-    const [handleReq, setHandleReq] = useState<any>()
 
     useEffect(() => {
         if (!window.google) {
@@ -829,8 +828,6 @@ export default function RestImport({ language, restImportConfig }: { language: s
 
                     setloading(true)
                     const response: any = await Apicall(requestConfig as AxiosRequestConfig)
-                    setHandleReq(requestConfig)
-                    setHandleRes(response)
                     if (response.status >= 200 && response.status < 300) {
                         if (providerId) {
                             if (response.status === 401 || response.data.statusCode === 401) {
@@ -1117,8 +1114,6 @@ export default function RestImport({ language, restImportConfig }: { language: s
         const config = useProxy ? configWProxy : configWOProxy
         setloading(true)
         const response: any = await Apicall(config as AxiosRequestConfig)
-        setHandleReq(config)
-        setHandleRes(response)
         if (response.status >= 200 && response.status < 300) {
             if (response.data.statusCode === 200) {
                 const settingsUploadData = await settingsUpload(config, response)
@@ -1230,10 +1225,8 @@ export default function RestImport({ language, restImportConfig }: { language: s
                     restImportConfig.getServiceName(updateSwaggerResponse?.serviceId)
                     setserviceName(updateSwaggerResponse?.serviceId)
                 }
-                if(handleRes && handleReq)
-                    handleResponse(handleRes, handleReq, updateSwaggerResponse)
+                restImportConfig.handleUpdateSwaggerResponse(updateSwaggerResponse)
             } else {
-                handleResponse(handleRes, handleReq)
                 console.log("Received an unexpected response:", response);
             }
         }
@@ -1297,10 +1290,10 @@ export default function RestImport({ language, restImportConfig }: { language: s
                                         }} disabled={serviceNameEnabled || restImportConfig.viewMode} size='small' />
                                 </Stack>
                             </Grid>
-                            <Grid item md={4} px={2}>
+                            <Grid item md={3} px={1}>
                                 <Stack sx={{ cursor: "pointer" }} spacing={2} display={'flex'} alignItems={'center'} direction={'row'}>
                                 <Typography sx={{ marginRight: '15px' }}>{translate("BASE_PATH")}</Typography>
-                                <FormControl size='small' sx={{width:'200px'}}>
+                                <FormControl size='small'>
                                     <Select
                                         className='form-control-select service-base-path'
                                         name="wm-base-path"
@@ -1329,7 +1322,7 @@ export default function RestImport({ language, restImportConfig }: { language: s
                                 </Stack>
                             </Grid>
                             {!useProxy &&
-                                <Grid item md={2}>
+                                <Grid item md={3}>
                                     <Stack  display={'flex'} alignItems={'center'} direction={'row'}>
                                         <Typography>{translate('WITH_CREDENTIALS')}</Typography>
                                         <Switch name="wm-webservice-with-credentials" data-testid="with-credentials" checked={withCredentials} onChange={handleChangeWithCredentials} />
diff --git a/src/index.scss b/src/index.scss
index fa0d38d..44dd045 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -84,6 +84,9 @@
     color: #212121;
     border-color: #d3d3d3;
   }
+  .service-base-path{
+    width: 12em;
+  }
 
 
 }
diff --git a/src/test/providermodal.test.tsx b/src/test/providermodal.test.tsx
index d017763..e80879f 100644
--- a/src/test/providermodal.test.tsx
+++ b/src/test/providermodal.test.tsx
@@ -51,7 +51,9 @@ export const ProxyOFFConfig: restImportConfigI = {
     setResponseHeaders: { namespace: "test" },
     monacoEditorURL: "",
     urlBasePath: '',
-    settingsDetailsResponse : {}
+    settingsDetailsResponse : {},
+    handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}
+
 }
 
 const mockProxyOFFProps: mockPropsI = {
diff --git a/src/test/testdata.ts b/src/test/testdata.ts
index f905940..e909ad9 100644
--- a/src/test/testdata.ts
+++ b/src/test/testdata.ts
@@ -300,7 +300,8 @@ export const emptyConfig: restImportConfigI = {
   viewMode: false,
   monacoEditorURL: "",
   urlBasePath: '',
-  settingsDetailsResponse : {}
+  settingsDetailsResponse : {},
+  handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}
 };
 export const mockEmptyProps: mockPropsI = {
   language: "en",
@@ -354,7 +355,9 @@ const configWithData: restImportConfigI = {
   setResponseHeaders: { namespace: "test" },
   monacoEditorURL: "",
   urlBasePath: '',
-  settingsDetailsResponse : {}
+  settingsDetailsResponse : {},
+  handleUpdateSwaggerResponse: (updateSwaggerResponse: any) => {}
+
 };
 
 export const preLoadedProps: mockPropsI = {