diff --git a/frontend/src/pages/devices/usp/[...id].js b/frontend/src/pages/devices/usp/[...id].js
index 4baa31b..9643814 100644
--- a/frontend/src/pages/devices/usp/[...id].js
+++ b/frontend/src/pages/devices/usp/[...id].js
@@ -25,8 +25,8 @@ const Page = () => {
                 return <DevicesRPC/>
             case "discovery":
                 return <DevicesDiscovery/>
-            case "wifi":
-                return <DevicesWiFi/>
+            // case "wifi":
+            //     return <DevicesWiFi/>
             default:
                 return <p>Hello World</p>
         }
@@ -58,7 +58,7 @@ const Page = () => {
                 }}
                 mb={3}>
                     <Tabs value={router.query.id[1]}  aria-label="icon label tabs example">
-                        <Tab icon={<SvgIcon><WifiIcon/></SvgIcon>} iconPosition={"end"} label="Wi-Fi" onClick={()=>{router.push(`/devices/usp/${deviceID}/wifi`)}} value={"wifi"}/>
+                        {/* <Tab icon={<SvgIcon><WifiIcon/></SvgIcon>} iconPosition={"end"} label="Wi-Fi" onClick={()=>{router.push(`/devices/usp/${deviceID}/wifi`)}} value={"wifi"}/> */}
                         <Tab value={"discovery"} onClick={()=>{router.push(`/devices/usp/${deviceID}/discovery`)}} icon={<SvgIcon><MagnifyingGlassIcon/></SvgIcon>} iconPosition={"end"} label="Discover Parameters" />
                         <Tab value={"msg"} onClick={()=>{router.push(`/devices/usp/${deviceID}/msg`)}} icon={<SvgIcon><EnvelopeIcon/></SvgIcon>} iconPosition={"end"} label="Remote Messages" />
                     </Tabs>
diff --git a/frontend/src/sections/devices/usp/devices-rpc.js b/frontend/src/sections/devices/usp/devices-rpc.js
index 6da1c33..8406877 100644
--- a/frontend/src/sections/devices/usp/devices-rpc.js
+++ b/frontend/src/sections/devices/usp/devices-rpc.js
@@ -207,7 +207,7 @@ const handleOpen = () => {
               onChange={handleChange}
               value={value}
               fullWidth
-              rows="9"
+              rows="15"
             />
           </Stack>
         </CardContent>
diff --git a/frontend/src/sections/overview/overview-latest-orders.js b/frontend/src/sections/overview/overview-latest-orders.js
index 222cbda..4d3e14a 100644
--- a/frontend/src/sections/overview/overview-latest-orders.js
+++ b/frontend/src/sections/overview/overview-latest-orders.js
@@ -108,7 +108,11 @@ export const OverviewLatestOrders = (props) => {
                     {order.Status == 2 && 
                       <Button
                         onClick={()=>{
-                          router.push("devices/"+ getDeviceProtocol(order) +"/"+order.SN+"/wifi")
+                          if (getDeviceProtocol(order) == "usp"){
+                            router.push("devices/"+ getDeviceProtocol(order) +"/"+order.SN+"/discovery")
+                          }else {
+                            router.push("devices/"+ getDeviceProtocol(order) +"/"+order.SN+"/wifi")
+                          }
                         }}
                       >
                         <SvgIcon