diff --git a/src/components/TradeForm.jsx b/src/components/TradeForm.jsx
index ad6110a80..794e0c20a 100644
--- a/src/components/TradeForm.jsx
+++ b/src/components/TradeForm.jsx
@@ -1,4 +1,4 @@
-import { Button, Input, Radio, Switch, Slider } from 'antd';
+import { Button, Input, Radio, Switch, Slider, Select } from 'antd';
 import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import {
@@ -9,18 +9,29 @@ import {
   useSelectedOpenOrdersAccount,
   useSelectedBaseCurrencyAccount,
   useSelectedQuoteCurrencyAccount,
+  useOrderbook,
+  useFeeDiscountKeys,
+  calculateBestPrice,
 } from '../utils/markets';
+import { getFeeRates } from '@project-serum/serum';
 import { useWallet } from '../utils/wallet';
 import { notify } from '../utils/notifications';
 import {
   getDecimalCount,
   roundToDecimal,
   floorToDecimal,
+  isIncrement,
 } from '../utils/utils';
 import { useSendConnection } from '../utils/connection';
 import FloatingElement from './layout/FloatingElement';
 import { placeOrder } from '../utils/send';
 
+const DEFAULT_ORDER_TYPE = 'limit';
+const ORDER_TYPES = [
+  { label: 'Limit', value: 'limit' },
+  { label: 'Market', value: 'market' },
+];
+
 const SellButton = styled(Button)`
   margin: 20px 0px 0px 0px;
   background: #f23b69;
@@ -42,7 +53,6 @@ const sliderMarks = {
 };
 
 export default function TradeForm({ style, setChangeOrderRef }) {
-  const [side, setSide] = useState('buy');
   const { baseCurrency, quoteCurrency, market } = useMarket();
   const baseCurrencyBalances = useBaseCurrencyBalances();
   const quoteCurrencyBalances = useQuoteCurrencyBalances();
@@ -52,7 +62,11 @@ export default function TradeForm({ style, setChangeOrderRef }) {
   const { wallet } = useWallet();
   const sendConnection = useSendConnection();
   const markPrice = useMarkPrice();
+  const [orderbook] = useOrderbook();
+  const [feeAccounts] = useFeeDiscountKeys();
 
+  const [side, setSide] = useState('buy');
+  const [orderType, setOrderType] = useState(DEFAULT_ORDER_TYPE);
   const [postOnly, setPostOnly] = useState(false);
   const [ioc, setIoc] = useState(false);
   const [baseSize, setBaseSize] = useState(null);
@@ -65,6 +79,7 @@ export default function TradeForm({ style, setChangeOrderRef }) {
     ? market.quoteSplSizeToNumber(openOrdersAccount.quoteTokenFree)
     : 0;
 
+  let feeRates = getFeeRates(feeAccounts && feeAccounts[0]?.feeTier);
   let quoteBalance = (quoteCurrencyBalances || 0) + (availableQuote || 0);
   let baseBalance = baseCurrencyBalances || 0;
   let sizeDecimalCount =
@@ -86,11 +101,21 @@ export default function TradeForm({ style, setChangeOrderRef }) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [price, baseSize]);
 
+  const onSetPrice = (price) => {
+    const formattedPrice = isIncrement(price, market?.tickSize)
+      ? price
+      : floorToDecimal(price, priceDecimalCount);
+    setPrice(formattedPrice);
+  };
+
   const onSetBaseSize = (baseSize) => {
-    setBaseSize(baseSize);
-    const rawQuoteSize = baseSize * (price || markPrice);
+    const formattedBaseSize = isIncrement(baseSize, market?.minOrderSize)
+      ? baseSize
+      : floorToDecimal(baseSize, sizeDecimalCount);
+    setBaseSize(formattedBaseSize);
+    const rawQuoteSize = formattedBaseSize * (price || markPrice);
     const quoteSize =
-      baseSize && roundToDecimal(rawQuoteSize, sizeDecimalCount);
+      formattedBaseSize && roundToDecimal(rawQuoteSize, sizeDecimalCount);
     setQuoteSize(quoteSize);
   };
 
@@ -105,11 +130,20 @@ export default function TradeForm({ style, setChangeOrderRef }) {
     const formattedSize = size && roundToDecimal(size, sizeDecimalCount);
     const formattedPrice = price && roundToDecimal(price, priceDecimalCount);
     formattedSize && onSetBaseSize(formattedSize);
-    formattedPrice && setPrice(formattedPrice);
+    formattedPrice && onSetPrice(formattedPrice);
   };
 
   const updateSizeFraction = () => {
-    const rawMaxSize = side === 'buy' ? quoteBalance / price : baseBalance;
+    let rawMaxSize;
+    if (side === 'sell') {
+      rawMaxSize = baseBalance;
+    } else {
+      let maxQuoteBalance =
+        orderType === 'market' || price >= orderbook?.asks[0]?.[0]
+          ? (1 - feeRates.taker) * quoteBalance
+          : quoteBalance;
+      rawMaxSize = maxQuoteBalance / price;
+    }
     const maxSize = floorToDecimal(rawMaxSize, sizeDecimalCount);
     const sizeFraction = Math.min((baseSize / maxSize) * 100, 100);
     setSizeFraction(sizeFraction);
@@ -120,7 +154,7 @@ export default function TradeForm({ style, setChangeOrderRef }) {
       let formattedMarkPrice = priceDecimalCount
         ? markPrice.toFixed(priceDecimalCount)
         : markPrice;
-      setPrice(formattedMarkPrice);
+      onSetPrice(formattedMarkPrice);
     }
 
     let newSize;
@@ -152,8 +186,16 @@ export default function TradeForm({ style, setChangeOrderRef }) {
   };
 
   async function onSubmit() {
-    const parsedPrice = parseFloat(price);
-    const parsedSize = parseFloat(baseSize);
+    let parsedSize = parseFloat(baseSize);
+    let parsedPrice;
+    if (orderType === 'market') {
+      parsedPrice =
+        side === 'buy'
+          ? calculateBestPrice(orderbook, parsedSize)
+          : market?.tickSize;
+    } else {
+      parsedPrice = parseFloat(price);
+    }
 
     setSubmitting(true);
     try {
@@ -168,7 +210,7 @@ export default function TradeForm({ style, setChangeOrderRef }) {
         baseCurrencyAccount: baseCurrencyAccount?.pubkey,
         quoteCurrencyAccount: quoteCurrencyAccount?.pubkey,
       });
-      setPrice(null);
+      onSetPrice(null);
       onSetBaseSize(null);
     } catch (e) {
       console.warn(e);
@@ -219,16 +261,32 @@ export default function TradeForm({ style, setChangeOrderRef }) {
             SELL
           </Radio.Button>
         </Radio.Group>
+        <div style={{ display: 'flex', paddingBottom: 8 }}>
+          <span
+            className="ant-input-group-addon"
+            style={{ width: '53px', display: 'flex', alignItems: 'center' }}
+          >
+            Type
+          </span>
+          <Select
+            style={{ flex: 1, textAlign: 'center' }}
+            defaultValue={DEFAULT_ORDER_TYPE}
+            value={orderType}
+            options={ORDER_TYPES}
+            onSelect={setOrderType}
+          />
+        </div>
         <Input
           style={{ textAlign: 'right', paddingBottom: 8 }}
           addonBefore={<div style={{ width: '30px' }}>Price</div>}
           suffix={
             <span style={{ fontSize: 10, opacity: 0.5 }}>{quoteCurrency}</span>
           }
-          value={price}
-          type="number"
+          value={orderType === 'market' ? 'MARKET' : price}
+          type={orderType === 'market' ? 'text' : 'number'}
           step={market?.tickSize || 1}
-          onChange={(e) => setPrice(e.target.value)}
+          disabled={orderType === 'market'}
+          onChange={(e) => onSetPrice(e.target.value)}
         />
         <Input.Group compact style={{ paddingBottom: 8 }}>
           <Input
@@ -274,7 +332,7 @@ export default function TradeForm({ style, setChangeOrderRef }) {
       </div>
       {side === 'buy' ? (
         <BuyButton
-          disabled={!price || !baseSize}
+          disabled={(orderType !== 'market' && !price) || !baseSize}
           onClick={onSubmit}
           block
           type="primary"
@@ -285,7 +343,7 @@ export default function TradeForm({ style, setChangeOrderRef }) {
         </BuyButton>
       ) : (
         <SellButton
-          disabled={!price || !baseSize}
+          disabled={(orderType !== 'market' && !price) || !baseSize}
           onClick={onSubmit}
           block
           type="primary"
diff --git a/src/utils/markets.js b/src/utils/markets.js
index e397b1f07..92131e03a 100644
--- a/src/utils/markets.js
+++ b/src/utils/markets.js
@@ -1019,6 +1019,15 @@ export function useBalancesForDeprecatedMarkets() {
   return openOrderAccountBalances;
 }
 
+export function calculateBestPrice(orderbook, size) {
+  let remainingSize = size;
+  for (let [price, size] of orderbook?.asks) {
+    remainingSize -= size;
+    if (remainingSize <= 0) return price;
+  }
+  return orderbook?.asks[orderbook.asks.length - 1]?.[0];
+}
+
 export function getMarketInfos(customMarkets) {
   const customMarketsInfo = customMarkets.map((m) => ({
     ...m,
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2eff6296d..595175e06 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -13,6 +13,12 @@ export function isValidPublicKey(key) {
   }
 }
 
+export function isIncrement(num, step) {
+  return (
+    Math.abs((num / step) % 1) < 1e-5 || Math.abs(((num / step) % 1) - 1) < 1e-5
+  );
+}
+
 export async function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }