diff --git a/frontend/src/basic/MakerPage/index.tsx b/frontend/src/basic/MakerPage/index.tsx
index dc3f502d..00c18402 100644
--- a/frontend/src/basic/MakerPage/index.tsx
+++ b/frontend/src/basic/MakerPage/index.tsx
@@ -6,6 +6,7 @@ import { filterOrders, genBase62Token } from '../../utils';
 
 import MakerForm from '../../components/MakerForm';
 import BookTable from '../../components/BookTable';
+import thirdParties from '../../../static/thirdparties.json';
 
 import { AppContext, type UseAppStoreType } from '../../contexts/AppContext';
 import { NoRobotDialog } from '../../components/Dialogs';
@@ -20,6 +21,7 @@ const MakerPage = (): React.JSX.Element => {
   const { garage, maker } = useContext<UseGarageStoreType>(GarageContext);
   const { t } = useTranslation();
   const navigate = useNavigate();
+  const mobileView = windowSize?.width < 50;
 
   const maxHeight = (windowSize.height - navbarHeight) * 0.85 - 3;
   const [showMatches, setShowMatches] = useState<boolean>(false);
@@ -76,6 +78,9 @@ const MakerPage = (): React.JSX.Element => {
     }
   };
 
+  const tableMaxWidth = mobileView ? windowSize.width * 0.8 : Math.min(windowSize.width, 60);
+  const tableMaxHeight = Math.min(matches.length * 3.25 + 3, windowSize.height * 0.68);
+
   return (
     <Grid container direction='column' alignItems='center' spacing={1}>
       <VisitThirdParty
@@ -113,8 +118,8 @@ const MakerPage = (): React.JSX.Element => {
             <Grid item>
               <BookTable
                 orderList={matches}
-                maxWidth={Math.min(windowSize.width, 60)} // EM units
-                maxHeight={Math.min(matches.length * 3.25 + 3, 16)} // EM units
+                maxWidth={tableMaxWidth} // EM units
+                maxHeight={tableMaxHeight} // EM units
                 defaultFullscreen={false}
                 showControls={false}
                 showFooter={false}
diff --git a/frontend/src/components/MakerForm/SelectCoordinator.tsx b/frontend/src/components/MakerForm/SelectCoordinator.tsx
index d4518914..09306650 100644
--- a/frontend/src/components/MakerForm/SelectCoordinator.tsx
+++ b/frontend/src/components/MakerForm/SelectCoordinator.tsx
@@ -58,7 +58,7 @@ const SelectCoordinator: React.FC<SelectCoordinatorProps> = ({
           }
           sx={{ marginTop: 2 }}
         >
-          {coordinator?.info
+          {!coordinator?.loadingInfo
             ? coordinator?.info?.swap_enabled
               ? t('Supports on-chain swaps.')
               : t('Does not support on-chain swaps.')
diff --git a/frontend/src/components/OrderDetails/index.tsx b/frontend/src/components/OrderDetails/index.tsx
index 7f101f8c..bada6c2e 100644
--- a/frontend/src/components/OrderDetails/index.tsx
+++ b/frontend/src/components/OrderDetails/index.tsx
@@ -290,7 +290,7 @@ const OrderDetails = ({
               }
               style={{ width: '100%' }}
             >
-              {coordinator?.info
+              {!coordinator?.loadingInfo
                 ? coordinator?.info?.swap_enabled
                   ? t('Supports on-chain swaps.')
                   : t('Does not support on-chain swaps.')