diff --git a/src/components/blocks/LeftNav.js b/src/components/blocks/LeftNav.js
index 60c7ae01..55995540 100644
--- a/src/components/blocks/LeftNav.js
+++ b/src/components/blocks/LeftNav.js
@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import styled, { withTheme } from 'styled-components';
 import {
-  ClimateWarehouseLogo,
   ButtonText,
   WarehouseIcon,
   RegistryIcon,
@@ -30,12 +29,6 @@ const NavContainer = styled('div')`
   background-color: #3b8ee0;
 `;
 
-const LogoContainer = styled('div')`
-  display: flex;
-  justify-content: center;
-  margin: 20.46px auto 3.5344rem auto;
-`;
-
 const StyledCreateOrgButtonContainer = styled('div')`
   h4 {
     color: white;
@@ -94,9 +87,6 @@ const LeftNav = withTheme(({ children }) => {
   return (
     <Container>
       <NavContainer>
-        <LogoContainer>
-          <ClimateWarehouseLogo />
-        </LogoContainer>
         <StyledTitleContainer>
           <WarehouseIcon height={24} width={24} />
           <ButtonText>
@@ -109,8 +99,7 @@ const LeftNav = withTheme(({ children }) => {
           onClick={() => {
             dispatch(resetRefreshPrompt);
             setLocation('projects');
-          }}
-        >
+          }}>
           <FormattedMessage id="projects-list" />
         </MenuItem>
         <div></div>
@@ -120,8 +109,7 @@ const LeftNav = withTheme(({ children }) => {
           onClick={() => {
             dispatch(resetRefreshPrompt);
             setLocation('units');
-          }}
-        >
+          }}>
           <FormattedMessage id="units-list" />
         </MenuItem>
         <StyledTitleContainer disabled={myOrgIsNotCreated}>
@@ -138,8 +126,7 @@ const LeftNav = withTheme(({ children }) => {
               onClick={() => {
                 dispatch(resetRefreshPrompt);
                 setLocation('my-projects');
-              }}
-            >
+              }}>
               <FormattedMessage id="my-projects" />
             </MenuItem>
             <div></div>
@@ -149,8 +136,7 @@ const LeftNav = withTheme(({ children }) => {
               onClick={() => {
                 dispatch(resetRefreshPrompt);
                 setLocation('my-units');
-              }}
-            >
+              }}>
               <FormattedMessage id="my-units" />
             </MenuItem>
           </>
@@ -160,21 +146,18 @@ const LeftNav = withTheme(({ children }) => {
             <MenuItem
               to={window.location}
               onClick={() => setConfirmCreateOrgIsVisible(true)}
-              disabled
-            >
+              disabled>
               <FormattedMessage id="my-projects" />
             </MenuItem>
             <div></div>
             <MenuItem
               to={window.location}
               onClick={() => setConfirmCreateOrgIsVisible(true)}
-              disabled
-            >
+              disabled>
               <FormattedMessage id="my-units" />
             </MenuItem>
             <StyledCreateOrgButtonContainer
-              onClick={() => setCreateOrgIsVisible(true)}
-            >
+              onClick={() => setCreateOrgIsVisible(true)}>
               <AddIconCircle width="20" height="20" />
               <ButtonText>
                 <FormattedMessage id="create-organization" />
diff --git a/src/components/blocks/LocaleSwitcher.js b/src/components/blocks/LocaleSwitcher.js
index b01eb5ef..66252759 100644
--- a/src/components/blocks/LocaleSwitcher.js
+++ b/src/components/blocks/LocaleSwitcher.js
@@ -2,9 +2,9 @@ import React from 'react';
 import styled, {withTheme} from 'styled-components';
 import {useDispatch, useSelector} from 'react-redux';
 import {Select, MenuItem} from '@mui/material';
-import {LocaleIcon} from '../../components';
 import {LANGUAGE_CODES} from '../../translations';
 import {setLocale} from '../../store/actions/app';
+import { SelectSizeEnum, SelectTypeEnum } from '..';
 
 const Container = styled('div')`
   display: flex;
@@ -27,10 +27,10 @@ const LocaleSwitcher = withTheme(() => {
 
   return (
     <Container selectedTheme={appStore.theme}>
-      <LocaleIcon style={{marginRight: '10px'}} />
       <Select
         disableUnderline
-        variant="standard"
+        size={SelectSizeEnum.small}
+        type={SelectTypeEnum.basic}
         value={appStore.locale}
         onChange={handleLocaleChange}>
         {Object.keys(LANGUAGE_CODES).map(key => (
diff --git a/src/components/icons/ClimateWarehouseLogo.js b/src/components/icons/ClimateWarehouseLogo.js
index 9c8212f7..6e64f1aa 100644
--- a/src/components/icons/ClimateWarehouseLogo.js
+++ b/src/components/icons/ClimateWarehouseLogo.js
@@ -36,7 +36,7 @@ const ClimateWarehouseLogo = withTheme(({ width = 198, height = 45 }) => {
         />
         <path
           d="M59.4572 27.7991C61.6617 27.7991 63.0008 26.656 63.8336 25.3496L62.2006 24.5168C61.9202 24.9963 61.5198 25.3945 61.0387 25.6723C60.5577 25.95 60.0126 26.0977 59.4572 26.1008C57.3016 26.1008 55.7013 24.4515 55.7013 22.1653C55.7013 19.8791 57.3016 18.2298 59.4572 18.2298C60.6329 18.2298 61.678 18.9157 62.2006 19.8138L63.8336 18.981C63.0171 17.6746 61.6617 16.5315 59.4572 16.5315C56.2402 16.5315 53.7417 18.8177 53.7417 22.1653C53.7417 25.5129 56.2402 27.7991 59.4572 27.7991ZM67.0281 27.6032V16.7111H65.3135V27.6032H67.0281ZM70.1015 18.7524C70.6894 18.7524 71.163 18.2788 71.163 17.6909C71.163 17.103 70.6894 16.6295 70.1015 16.6295C69.53 16.6295 69.0401 17.103 69.0401 17.6909C69.0401 18.2788 69.53 18.7524 70.1015 18.7524ZM70.967 27.6032V19.7158H69.2524V27.6032H70.967ZM84.5739 27.6032V21.904C84.5739 20.3037 83.7574 19.5199 82.3041 19.5199C81.1283 19.5199 80.0832 20.2547 79.626 20.9732C79.3647 20.1077 78.6462 19.5199 77.4704 19.5199C76.2776 19.5199 75.2332 20.3037 74.9066 20.7936V19.7158H73.192V27.6032H74.9066V22.1C75.2659 21.5774 75.9681 21.0385 76.7192 21.0385C77.65 21.0385 78.0256 21.6101 78.0256 22.4592V27.6032H79.7403V22.0837C80.0832 21.5774 80.8017 21.0385 81.5692 21.0385C82.4837 21.0385 82.8593 21.6101 82.8593 22.4592V27.6032H84.5739ZM93.3267 27.6032V22.3776C93.3267 20.2547 91.7917 19.5199 90.0444 19.5199C88.787 19.5199 87.6439 19.9281 86.7295 20.7936L87.4316 21.9857C88.1175 21.3162 88.885 20.9896 89.7668 20.9896C90.8609 20.9896 91.6121 21.5448 91.6121 22.4592V23.635C91.0405 22.9655 90.1261 22.6225 89.0646 22.6225C87.7746 22.6225 86.3212 23.3737 86.3212 25.1863C86.3212 26.9336 87.7746 27.7991 89.0646 27.7991C90.1097 27.7991 91.0242 27.4235 91.6121 26.754V27.6032H93.3267ZM89.7342 26.6234C88.7707 26.6234 88.0522 26.0682 88.0522 25.219C88.0522 24.3535 88.7707 23.7983 89.7342 23.7983C90.4853 23.7983 91.2202 24.0759 91.6121 24.6148V25.8069C91.2202 26.3458 90.4853 26.6234 89.7342 26.6234ZM97.9175 27.7991C98.7176 27.7991 99.2239 27.5868 99.5341 27.2929L99.1259 26.0028C98.9953 26.1498 98.685 26.2804 98.3584 26.2804C97.8685 26.2804 97.6072 25.8885 97.6072 25.3496V21.2182H99.2075V19.7158H97.6072V17.5603H95.8926V19.7158H94.5862V21.2182H95.8926V25.7742C95.8926 27.0806 96.5948 27.7991 97.9175 27.7991ZM104.406 27.7991C105.663 27.7991 106.823 27.4072 107.607 26.656L106.823 25.5293C106.267 26.0845 105.353 26.3948 104.586 26.3948C103.1 26.3948 102.201 25.415 102.071 24.2229H108.162V23.8146C108.162 21.3325 106.643 19.5199 104.275 19.5199C101.94 19.5199 100.274 21.3651 100.274 23.6513C100.274 26.1498 102.038 27.7991 104.406 27.7991ZM106.496 23.0145H102.054C102.136 22.051 102.806 20.9242 104.275 20.9242C105.827 20.9242 106.463 22.0837 106.496 23.0145ZM124.466 27.6032L127.569 16.7111H125.43L123.323 25.1047L121.07 16.7111H119.551L117.298 25.1047L115.175 16.7111H113.036L116.155 27.6032H118.196L120.302 19.5689L122.425 27.6032H124.466ZM134.677 27.6032V22.3776C134.677 20.2547 133.142 19.5199 131.395 19.5199C130.138 19.5199 128.995 19.9281 128.08 20.7936L128.782 21.9857C129.468 21.3162 130.236 20.9896 131.118 20.9896C132.212 20.9896 132.963 21.5448 132.963 22.4592V23.635C132.391 22.9655 131.477 22.6225 130.415 22.6225C129.125 22.6225 127.672 23.3737 127.672 25.1863C127.672 26.9336 129.125 27.7991 130.415 27.7991C131.46 27.7991 132.375 27.4235 132.963 26.754V27.6032H134.677ZM131.085 26.6234C130.121 26.6234 129.403 26.0682 129.403 25.219C129.403 24.3535 130.121 23.7983 131.085 23.7983C131.836 23.7983 132.571 24.0759 132.963 24.6148V25.8069C132.571 26.3458 131.836 26.6234 131.085 26.6234ZM138.615 27.6032V22.2306C138.958 21.6754 139.921 21.1855 140.64 21.1855C140.852 21.1855 141.032 21.2018 141.179 21.2345V19.5362C140.15 19.5362 139.203 20.1241 138.615 20.8752V19.7158H136.9V27.6032H138.615ZM146.204 27.7991C147.461 27.7991 148.62 27.4072 149.404 26.656L148.62 25.5293C148.065 26.0845 147.151 26.3948 146.383 26.3948C144.897 26.3948 143.999 25.415 143.868 24.2229H149.96V23.8146C149.96 21.3325 148.441 19.5199 146.073 19.5199C143.738 19.5199 142.072 21.3651 142.072 23.6513C142.072 26.1498 143.836 27.7991 146.204 27.7991ZM148.294 23.0145H143.852C143.934 22.051 144.603 20.9242 146.073 20.9242C147.624 20.9242 148.261 22.0837 148.294 23.0145ZM158.706 27.6032V22.0183C158.706 20.4017 157.857 19.5199 156.159 19.5199C154.918 19.5199 153.889 20.1731 153.366 20.7936V16.7111H151.652V27.6032H153.366V22.1C153.775 21.5611 154.526 21.0385 155.391 21.0385C156.355 21.0385 156.992 21.4141 156.992 22.6389V27.6032H158.706ZM164.493 27.7991C167.024 27.7991 168.559 25.9212 168.559 23.6513C168.559 21.3978 167.024 19.5199 164.493 19.5199C161.995 19.5199 160.443 21.3978 160.443 23.6513C160.443 25.9212 161.995 27.7991 164.493 27.7991ZM164.493 26.2804C163.04 26.2804 162.223 25.0557 162.223 23.6513C162.223 22.2633 163.04 21.0385 164.493 21.0385C165.963 21.0385 166.779 22.2633 166.779 23.6513C166.779 25.0557 165.963 26.2804 164.493 26.2804ZM177.332 27.6032V19.7158H175.617V25.2517C175.209 25.7905 174.458 26.2804 173.592 26.2804C172.629 26.2804 172.008 25.9049 172.008 24.6801V19.7158H170.294V25.3006C170.294 26.9173 171.126 27.7991 172.825 27.7991C173.351 27.798 173.871 27.687 174.352 27.4733C174.833 27.2596 175.264 26.9479 175.617 26.5581V27.6032H177.332ZM182.254 27.7991C184.377 27.7991 185.536 26.7377 185.536 25.3496C185.536 22.2143 180.768 23.2594 180.768 21.855C180.768 21.2998 181.339 20.8916 182.238 20.8916C183.217 20.8916 184.099 21.2998 184.573 21.8387L185.291 20.6303C184.573 19.9934 183.56 19.5199 182.221 19.5199C180.229 19.5199 179.119 20.6303 179.119 21.9204C179.119 24.9414 183.887 23.831 183.887 25.3823C183.887 26.0028 183.364 26.4437 182.336 26.4437C181.307 26.4437 180.213 25.9049 179.657 25.3333L178.874 26.5744C179.69 27.3745 180.915 27.7991 182.254 27.7991ZM190.903 27.7991C192.161 27.7991 193.32 27.4072 194.104 26.656L193.32 25.5293C192.765 26.0845 191.85 26.3948 191.083 26.3948C189.597 26.3948 188.699 25.415 188.568 24.2229H194.659V23.8146C194.659 21.3325 193.141 19.5199 190.773 19.5199C188.438 19.5199 186.772 21.3651 186.772 23.6513C186.772 26.1498 188.535 27.7991 190.903 27.7991ZM192.994 23.0145H188.552C188.633 22.051 189.303 20.9242 190.773 20.9242C192.324 20.9242 192.961 22.0837 192.994 23.0145Z"
-          fill="white"
+          fill="Black"
         />
       </svg>
     </>
diff --git a/src/components/layout/Dashboard.js b/src/components/layout/Dashboard.js
index 3a49f448..b8bf114e 100644
--- a/src/components/layout/Dashboard.js
+++ b/src/components/layout/Dashboard.js
@@ -1,16 +1,7 @@
 import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import styled, { withTheme } from 'styled-components';
-import { LeftNav, LocaleSwitcher, Body } from '..';
-
-const Container = styled('div')`
-  width: 100%;
-  display: flex;
-  background-color: #e5e5e5;
-  flex-direction: column;
-  justify-content: space-between;
-  overflow: hidden;
-`;
+import { LeftNav, LocaleSwitcher, Body, ClimateWarehouseLogo } from '..';
 
 const Headline = styled('div')`
   width: 100%;
@@ -22,12 +13,12 @@ const Main = styled('div')`
   width: 100%;
   height: 100%;
   display: flex;
+  flex-direction: column;
 `;
 
 const BodyText = styled('div')`
   max-width: calc(100% - 3rem);
   width: calc(100% - 3rem);
-  height: 100%;
   margin: 1.5rem;
   background-color: #ffffff;
   overflow: hidden;
@@ -35,17 +26,25 @@ const BodyText = styled('div')`
   padding: 0;
 `;
 
+const InnerContainer = styled('div')`
+  display: flex;
+  height: 100%;
+`;
+
+const LogoContainer = styled('div')`
+  align-self: center;
+`;
+
 const StyledLocalContainer = styled('div')`
   width: 100%;
   height: 100%;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
   padding: 0rem 1.5rem 0rem 1.5rem;
   box-sizing: border-box;
 `;
 
 const HomeOrgUidContainer = styled('div')`
-  width: 100%;
   align-self: center;
 `;
 
@@ -63,20 +62,25 @@ const Dashboard = withTheme(({ children }) => {
 
   return (
     <Main>
-      <LeftNav />
-      <Container>
-        <Headline>
-          <StyledLocalContainer>
-            <HomeOrgUidContainer>
-              {homeOrgUid ? (
+      <Headline>
+        <StyledLocalContainer>
+          <LogoContainer>
+            <ClimateWarehouseLogo />
+          </LogoContainer>
+          <HomeOrgUidContainer>
+            {homeOrgUid ? (
+              <div>
                 <Body size="Small">{`Organization ID: ${homeOrgUid}`}</Body>
-              ) : null}
-            </HomeOrgUidContainer>
-            <LocaleSwitcher />
-          </StyledLocalContainer>
-        </Headline>
+              </div>
+            ) : null}
+          </HomeOrgUidContainer>
+          <LocaleSwitcher />
+        </StyledLocalContainer>
+      </Headline>
+      <InnerContainer>
+        <LeftNav />
         <BodyText>{children}</BodyText>
-      </Container>
+      </InnerContainer>
     </Main>
   );
 });