diff --git a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart b/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart
index 51be4b7..6af8799 100644
--- a/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/buy_in_province_waiting/view.dart
@@ -77,7 +77,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
             spacing: 3,
             children: [
               Text(
-                item.steward?.user?.fullname ?? 'N/A',
+                item.toSteward?.user?.fullname ?? 'N/A',
                 textAlign: TextAlign.start,
                 style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
               ),
@@ -118,7 +118,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
               ),
 
               Text(
-                item.steward?.guildsName ?? 'N/A',
+                item?.toSteward?.guildsName ?? 'N/A',
                 textAlign: TextAlign.start,
                 style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
               ),
diff --git a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart
index a86f359..defb47c 100644
--- a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart
@@ -25,52 +25,61 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
       onFilterTap: () {
         Get.bottomSheet(filterBottomSheet());
       },
-      widgets: [
-        inventoryWidget(controller.rootLogic),
-        Expanded(
-          child: ObxValue((data) {
-            return RPaginatedListView(
-              listType: ListType.separated,
-              resource: data.value,
-              hasMore: data.value.data?.next != null,
-              padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
-              itemBuilder: (context, index) {
-                var item = data.value.data!.results![index];
-                return ObxValue((val) {
-                  return ExpandableListItem2(
-                    selected: val.contains(index),
-                    onTap: () => controller.isExpandedList.toggle(index),
-                    index: index,
-                    child: itemListWidget(item),
-                    secondChild: itemListExpandedWidget(item),
-                    labelColor: AppColor.blueLight,
-                    labelIcon: Assets.vec.truckFastOutlinedSvg.path,
-                  );
-                }, controller.isExpandedList);
-              },
-              itemCount: data.value.data?.results?.length ?? 0,
-              separatorBuilder: (context, index) => SizedBox(height: 8.h),
-              onLoadMore: () async => controller.getStewardPurchaseOutOfProvince(true),
-              onRefresh: () async {
-                controller.currentPage.value = 1;
-                await controller.getStewardPurchaseOutOfProvince();
-              },
-            );
-          }, controller.purchaseOutOfProvinceList),
-        ),
-      ],
-      floatingActionButton: RFab.add(
-        onPressed: () {
-          Get.bottomSheet(
-            addPurchasedInformationBottomSheet(),
-            isScrollControlled: true,
-            ignoreSafeArea: false,
-          ).whenComplete(() {
-            controller.resetSubmitForm();
-          });
-        },
+
+      child: Stack(
+        children: [
+          Positioned.fill(child:Column(
+            children: [
+              inventoryWidget(controller.rootLogic),
+              ObxValue((data) {
+                return RPaginatedListView(
+                  listType: ListType.separated,
+                  resource: data.value,
+                  hasMore: data.value.data?.next != null,
+                  padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+                  itemBuilder: (context, index) {
+                    var item = data.value.data!.results![index];
+                    return ObxValue((val) {
+                      return ExpandableListItem2(
+                        selected: val.contains(index),
+                        onTap: () => controller.isExpandedList.toggle(index),
+                        index: index,
+                        child: itemListWidget(item),
+                        secondChild: itemListExpandedWidget(item),
+                        labelColor: AppColor.blueLight,
+                        labelIcon: Assets.vec.truckFastOutlinedSvg.path,
+                      );
+                    }, controller.isExpandedList);
+                  },
+                  itemCount: data.value.data?.results?.length ?? 0,
+                  separatorBuilder: (context, index) => SizedBox(height: 8.h),
+                  onLoadMore: () async => controller.getStewardPurchaseOutOfProvince(true),
+                  onRefresh: () async {
+                    controller.currentPage.value = 1;
+                    await controller.getStewardPurchaseOutOfProvince();
+                  },
+                );
+              }, controller.purchaseOutOfProvinceList)
+            ],
+          )),
+          Positioned(
+              right: 5,
+              bottom: 95,
+              child: RFab.add(
+            onPressed: () {
+              Get.bottomSheet(
+                addPurchasedInformationBottomSheet(),
+                isScrollControlled: true,
+                ignoreSafeArea: false,
+              ).whenComplete(() {
+                controller.resetSubmitForm();
+              });
+            },
+          ))
+
+        ],
       ),
-      floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
+
     );
   }
 
diff --git a/packages/chicken/lib/presentation/pages/steward/home/view.dart b/packages/chicken/lib/presentation/pages/steward/home/view.dart
index bfaf2c3..7429f45 100644
--- a/packages/chicken/lib/presentation/pages/steward/home/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/home/view.dart
@@ -65,7 +65,7 @@ class HomePage extends GetView<HomeLogic> {
                             ),
                             SizedBox(height: 8),
                             _todayShipmentWidget(),
-                            _todayShipmentWidget2(),
+                            //_todayShipmentWidget2(),
                             _inventoryWidget(),
 
                             Row(
@@ -105,7 +105,7 @@ class HomePage extends GetView<HomeLogic> {
                               children: [Icon(CupertinoIcons.chevron_down, size: 18)],
                             ),
                             _todayShipmentWidget(),
-                            _todayShipmentWidget2(),
+                            // _todayShipmentWidget2(),
                             _inventoryWidget(),
                           ],
                         ),
diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart b/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
index 51286b1..88dc1d7 100644
--- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart
@@ -74,7 +74,7 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
           ),
           Positioned(
             right: 5,
-            bottom: 15,
+            bottom: 95,
             child: SizedBox(
               width: Get.width - 30,
               child: Row(