diff --git a/ssi_rma/models/rma_line_mixin.py b/ssi_rma/models/rma_line_mixin.py
index d2a17fc..941c5ae 100644
--- a/ssi_rma/models/rma_line_mixin.py
+++ b/ssi_rma/models/rma_line_mixin.py
@@ -292,8 +292,9 @@ def _get_delivery_procurement_data(self):
         route = self.order_id.route_template_id.outbound_route_id
         location = (
             self.order_id.route_template_id.partner_location_id
-            or self.order_id.partner_id.property_stock_customer,
-        )  # TODO
+            or self.order_id.partner_id.property_stock_customer
+        )
+
         result = {
             "name": self.order_id.name,
             "group_id": group,
diff --git a/ssi_rma/views/customer_rma_in_views.xml b/ssi_rma/views/customer_rma_in_views.xml
index 08fca54..914f361 100644
--- a/ssi_rma/views/customer_rma_in_views.xml
+++ b/ssi_rma/views/customer_rma_in_views.xml
@@ -24,6 +24,6 @@
         parent="ssi_stock.menu_incoming_movement"
         groups="customer_rma_in_viewer_group"
         action="customer_rma_in_action"
-        sequence="210"
+        sequence="103"
     />
 </odoo>
diff --git a/ssi_rma/views/customer_rma_out_views.xml b/ssi_rma/views/customer_rma_out_views.xml
index fa541a4..262d73a 100644
--- a/ssi_rma/views/customer_rma_out_views.xml
+++ b/ssi_rma/views/customer_rma_out_views.xml
@@ -24,6 +24,6 @@
         parent="ssi_stock.menu_outgoing_movement"
         groups="customer_rma_out_viewer_group"
         action="customer_rma_out_action"
-        sequence="210"
+        sequence="103"
     />
 </odoo>
diff --git a/ssi_rma/views/rma_customer_view.xml b/ssi_rma/views/rma_customer_view.xml
index 75fd16a..8d4cfd1 100644
--- a/ssi_rma/views/rma_customer_view.xml
+++ b/ssi_rma/views/rma_customer_view.xml
@@ -43,9 +43,9 @@
     <menuitem
         id="rma_customer_menu"
         name="RMA Customers"
-        parent="menu_rma"
+        parent="stock.menu_stock_warehouse_mgmt"
         action="rma_customer_action"
         groups="rma_customer_viewer_group"
-        sequence="10"
+        sequence="180"
     />
 </odoo>
diff --git a/ssi_rma/views/rma_supplier_view.xml b/ssi_rma/views/rma_supplier_view.xml
index 6245a76..8d13392 100644
--- a/ssi_rma/views/rma_supplier_view.xml
+++ b/ssi_rma/views/rma_supplier_view.xml
@@ -42,9 +42,9 @@
     <menuitem
         id="rma_supplier_menu"
         name="RMA Suppliers"
-        parent="menu_rma"
+        parent="stock.menu_stock_warehouse_mgmt"
         action="rma_supplier_action"
         groups="rma_supplier_viewer_group"
-        sequence="10"
+        sequence="180"
     />
 </odoo>