diff --git a/frontend/src/basic/BookPage/index.tsx b/frontend/src/basic/BookPage/index.tsx
index 716180d4..2509775d 100644
--- a/frontend/src/basic/BookPage/index.tsx
+++ b/frontend/src/basic/BookPage/index.tsx
@@ -46,14 +46,6 @@ const BookPage = (): React.JSX.Element => {
   const NavButtons = function (): React.JSX.Element {
     return (
       <ButtonGroup variant='contained' color='inherit'>
-        <Button
-          color='primary'
-          onClick={() => {
-            navigate('/create');
-          }}
-        >
-          {t('Create')}
-        </Button>
         {doubleView ? (
           <></>
         ) : (
@@ -102,30 +94,30 @@ const BookPage = (): React.JSX.Element => {
             justifyContent='center'
             spacing={1}
             direction='row'
-            style={{ width: `${windowSize.width}em` }}
+            style={{ width: `${windowSize.width}em`, height: `${windowSize.height * 0.875}em` }}
           >
-            <Grid item>
+            <Grid>
               <BookTable
                 maxWidth={maxBookTableWidth} // EM units
-                maxHeight={windowSize.height * 0.825 - 5} // EM units
+                maxHeight={windowSize.height * 0.8} // EM units
                 fullWidth={windowSize.width} // EM units
                 fullHeight={windowSize.height} // EM units
                 defaultFullscreen={false}
                 onOrderClicked={onOrderClicked}
               />
             </Grid>
-            <Grid item justifyContent='space-between'>
-              <Grid item>
+            <Grid>
+              <Grid item style={{ marginBottom: 10 }}>
                 <DepthChart
                   maxWidth={chartWidthEm} // EM units
-                  maxHeight={(windowSize.height * 0.825 - 5) / 2} // EM units
+                  maxHeight={(windowSize.height * 0.82) / 2} // EM units
                   onOrderClicked={onOrderClicked}
                 />
               </Grid>
               <Grid item>
                 <MapChart
                   maxWidth={chartWidthEm} // EM units
-                  maxHeight={(windowSize.height * 0.825 - 5) / 2} // EM units
+                  maxHeight={(windowSize.height * 0.82) / 2} // EM units
                   onOrderClicked={onOrderClicked}
                 />
               </Grid>
@@ -134,13 +126,13 @@ const BookPage = (): React.JSX.Element => {
         ) : view === 'depth' ? (
           <DepthChart
             maxWidth={windowSize.width * 0.8} // EM units
-            maxHeight={windowSize.height * 0.825 - 5} // EM units
+            maxHeight={windowSize.height * 0.835} // EM units
             onOrderClicked={onOrderClicked}
           />
         ) : view === 'map' ? (
           <MapChart
             maxWidth={windowSize.width * 0.8} // EM units
-            maxHeight={windowSize.height * 0.825 - 5} // EM units
+            maxHeight={windowSize.height * 0.82} // EM units
             onOrderClicked={onOrderClicked}
           />
         ) : (
diff --git a/frontend/src/components/Charts/DepthChart/index.tsx b/frontend/src/components/Charts/DepthChart/index.tsx
index 2617b911..4283d836 100644
--- a/frontend/src/components/Charts/DepthChart/index.tsx
+++ b/frontend/src/components/Charts/DepthChart/index.tsx
@@ -295,20 +295,18 @@ const DepthChart: React.FC<DepthChartProps> = ({
             <CircularProgress />
           </div>
         ) : (
-          <Grid container style={{ paddingTop: '1em' }}>
+          <Grid container>
             <Grid
               container
               direction='row'
-              justifyContent='space-around'
-              alignItems='flex-start'
-              style={{ position: 'absolute' }}
+              justifyContent='space-between'
+              alignItems='center'
+              style={{ width: '100%' }}
             >
-              <Grid
-                container
-                justifyContent='flex-start'
-                alignItems='flex-start'
-                style={{ paddingLeft: '1em' }}
-              >
+              <Grid container style={{ paddingLeft: '1em', paddingTop: 3 }}>
+                <b>{t('Chart')}</b>
+              </Grid>
+              <Grid container style={{ paddingLeft: '1em' }}>
                 <Select
                   variant='standard'
                   value={xType}
@@ -328,8 +326,6 @@ const DepthChart: React.FC<DepthChartProps> = ({
                   </MenuItem>
                 </Select>
               </Grid>
-            </Grid>
-            <Grid container direction='row' justifyContent='center' alignItems='center'>
               <Grid container justifyContent='center' alignItems='center'>
                 <Grid item>
                   <IconButton
@@ -359,7 +355,10 @@ const DepthChart: React.FC<DepthChartProps> = ({
                 </Grid>
               </Grid>
             </Grid>
-            <Grid container style={{ height: `${height * 0.8}em`, padding: '1em' }}>
+            <Grid
+              container
+              style={{ height: `${height * 0.825}em`, width: '100%', padding: '1em' }}
+            >
               <ResponsiveLine
                 data={series}
                 enableArea={true}
diff --git a/frontend/src/components/Charts/MapChart/index.tsx b/frontend/src/components/Charts/MapChart/index.tsx
index 97ce0c0c..1ca4384f 100644
--- a/frontend/src/components/Charts/MapChart/index.tsx
+++ b/frontend/src/components/Charts/MapChart/index.tsx
@@ -24,7 +24,7 @@ interface MapChartProps {
   maxHeight: number;
   fillContainer?: boolean;
   elevation?: number;
-  onOrderClicked?: (id: number) => void;
+  onOrderClicked?: (id: number, shortAlias: string) => void;
 }
 
 const MapChart: React.FC<MapChartProps> = ({
@@ -90,7 +90,7 @@ const MapChart: React.FC<MapChartProps> = ({
               display: 'flex',
               justifyContent: 'center',
               paddingTop: `${(height - 3) / 2 - 1}em`,
-              height: `${height}em`,
+              height: `${height - 4}em`,
             }}
           >
             <CircularProgress />
@@ -101,11 +101,12 @@ const MapChart: React.FC<MapChartProps> = ({
               item
               style={{
                 height: '3.1em',
-                justifyContent: 'flex-end',
+                justifyContent: 'space-between',
                 display: 'flex',
                 paddingTop: '0.8em',
               }}
             >
+              <b style={{ paddingLeft: '1em' }}>{t('Map')}</b>
               <Tooltip enterTouchDelay={0} placement='top' title={t('Show tiles')}>
                 <div
                   style={{
@@ -129,7 +130,7 @@ const MapChart: React.FC<MapChartProps> = ({
                 </div>
               </Tooltip>
             </Grid>
-            <div style={{ height: `${height - 3.1}em` }}>
+            <div style={{ height: `${height * 0.825}em` }}>
               <Map
                 useTiles={useTiles}
                 orders={Object.values(federation.book)}
diff --git a/frontend/src/contexts/AppContext.tsx b/frontend/src/contexts/AppContext.tsx
index 1fcb27c6..7d7b1e9d 100644
--- a/frontend/src/contexts/AppContext.tsx
+++ b/frontend/src/contexts/AppContext.tsx
@@ -144,7 +144,7 @@ export interface UseAppStoreType {
   navbarHeight: number;
   open: OpenDialogs;
   setOpen: Dispatch<SetStateAction<OpenDialogs>>;
-  windowSize?: WindowSize;
+  windowSize: WindowSize;
   acknowledgedWarning: boolean;
   setAcknowledgedWarning: Dispatch<SetStateAction<boolean>>;
   clientVersion: {
@@ -212,8 +212,8 @@ export const AppContextProvider = ({ children }: AppContextProviderProps): React
     initialAppContext.slideDirection,
   );
   const [open, setOpen] = useState<OpenDialogs>(initialAppContext.open);
-  const [windowSize, setWindowSize] = useState<WindowSize>(() =>
-    getWindowSize(theme.typography.fontSize),
+  const [windowSize, setWindowSize] = useState<WindowSize>(
+    () => getWindowSize(theme.typography.fontSize) ?? { width: 0, height: 0 },
   );
   const [fav, setFav] = useState<Favorites>(initialAppContext.fav);
   const [acknowledgedWarning, setAcknowledgedWarning] = useState<boolean>(
diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
index 78c5a52e..02584837 100644
--- a/frontend/static/locales/ca.json
+++ b/frontend/static/locales/ca.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Utilitzant Bitcoin Testnet",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Gràfic",
-  "Create": "Crear",
   "List": "Taula",
   "Map": "Mapa",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Informació de RoboSats",
   "client for nerds": "client per nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Crear",
   "Garage": "Garage",
   "More": "Més",
   "Offers": "Ofertes",
diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
index 74dcaa26..4605d533 100644
--- a/frontend/static/locales/cs.json
+++ b/frontend/static/locales/cs.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
index c44317b1..5582b441 100644
--- a/frontend/static/locales/de.json
+++ b/frontend/static/locales/de.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
index 39561b70..f209e594 100644
--- a/frontend/static/locales/en.json
+++ b/frontend/static/locales/en.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
index bf673035..dcb5942c 100644
--- a/frontend/static/locales/es.json
+++ b/frontend/static/locales/es.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Usando Bitcoin Testnet",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Gráfico",
-  "Create": "Crear",
   "List": "Tabla",
   "Map": "Mapa",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Información RoboSats",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Crear",
   "Garage": "Garage",
   "More": "Más",
   "Offers": "Ofertas",
diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
index 283ed3e9..81a7e052 100644
--- a/frontend/static/locales/eu.json
+++ b/frontend/static/locales/eu.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Grafikoa",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
index deb97d5a..c7e7b02a 100644
--- a/frontend/static/locales/fr.json
+++ b/frontend/static/locales/fr.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Utilisation Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Graphique",
-  "Create": "Créer",
   "List": "Lister",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Créer",
   "Garage": "Garage",
   "More": "Plus",
   "Offers": "Offres",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
index 5683ffb7..cb15fc1c 100644
--- a/frontend/static/locales/it.json
+++ b/frontend/static/locales/it.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Testnet Bitcoin in uso",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Grafico",
-  "Create": "Crea",
   "List": "Elenca",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Informazioni su RoboSats",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Crea",
   "Garage": "Garage",
   "More": "Altro",
   "Offers": "Offerte",
diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json
index 0c9e901c..41ca407b 100644
--- a/frontend/static/locales/ja.json
+++ b/frontend/static/locales/ja.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Bitcoinテストネットを使用中",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "グラフ",
-  "Create": "作成",
   "List": "リスト",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats情報",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "作成",
   "Garage": "Garage",
   "More": "詳細",
   "Offers": "注文書",
diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
index 1dfe627c..ec51fdb0 100644
--- a/frontend/static/locales/pl.json
+++ b/frontend/static/locales/pl.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
index 63a48cc6..6675f6c2 100644
--- a/frontend/static/locales/pt.json
+++ b/frontend/static/locales/pt.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Usando Bitcoin Testnet",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Gráfico",
-  "Create": "Criar",
   "List": "Lista",
   "Map": "Mapa",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Informações do RoboSats",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Criar",
   "Garage": "Garage",
   "More": "Mais",
   "Offers": "Ofertas",
diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
index 5597352e..ee4c766e 100644
--- a/frontend/static/locales/ru.json
+++ b/frontend/static/locales/ru.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Использование тестнет Биткойна",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "График",
-  "Create": "Создать",
   "List": "Список",
   "Map": "Карта",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Информация о RoboSats",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Создать",
   "Garage": "Garage",
   "More": "Больше",
   "Offers": "Оферы",
diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
index f398dbe8..346916a1 100644
--- a/frontend/static/locales/sv.json
+++ b/frontend/static/locales/sv.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json
index dc3b9c76..ea80f376 100644
--- a/frontend/static/locales/sw.json
+++ b/frontend/static/locales/sw.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Kutumia Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chatu",
-  "Create": "Unda",
   "List": "Orodha",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "Taarifa za RoboSats",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Unda",
   "Garage": "Garage",
   "More": "Zaidi",
   "Offers": "Ofa",
diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
index aac8d91d..8049d6c0 100644
--- a/frontend/static/locales/th.json
+++ b/frontend/static/locales/th.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "Using Testnet Bitcoin",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "Chart",
-  "Create": "Create",
   "List": "List",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats information",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "Create",
   "Garage": "Garage",
   "More": "More",
   "Offers": "Offers",
diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
index adccbdbd..ff635e47 100644
--- a/frontend/static/locales/zh-SI.json
+++ b/frontend/static/locales/zh-SI.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "正在使用测试网比特币",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "图表",
-  "Create": "创建",
   "List": "列表",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats 信息",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "创建",
   "Garage": "Garage",
   "More": "更多",
   "Offers": "报价",
diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
index 8a4b9609..f85e3c6c 100644
--- a/frontend/static/locales/zh-TR.json
+++ b/frontend/static/locales/zh-TR.json
@@ -3,7 +3,6 @@
   "Using Testnet Bitcoin": "正在使用測試網比特幣",
   "#2": "Phrases in basic/BookPage/index.tsx",
   "Chart": "圖表",
-  "Create": "創建",
   "List": "列表",
   "Map": "Map",
   "#3": "Phrases in basic/MakerPage/index.tsx",
@@ -15,6 +14,7 @@
   "RoboSats information": "RoboSats 信息",
   "client for nerds": "client for nerds",
   "#5": "Phrases in basic/NavBar/NavBar.tsx",
+  "Create": "創建",
   "Garage": "Garage",
   "More": "更多",
   "Offers": "報價",