diff --git a/frontend/webapp/app/(setup)/choose-destination/page.tsx b/frontend/webapp/app/(setup)/choose-destination/page.tsx
index 66b0badb5..07187db2a 100644
--- a/frontend/webapp/app/(setup)/choose-destination/page.tsx
+++ b/frontend/webapp/app/(setup)/choose-destination/page.tsx
@@ -1,18 +1,16 @@
 'use client';
 import React from 'react';
-import { StepsList } from '@/components';
-import { ChooseDestinationContainer } from '@/containers';
-import { CardWrapper, PageContainer, StepListWrapper } from '../styled';
+import { SideMenu } from '@/components';
+import { SideMenuWrapper } from '../styled';
+import { ChooseDestinationContainer } from '@/containers/main';
 
 export default function ChooseDestinationPage() {
   return (
-    <PageContainer>
-      <StepListWrapper>
-        <StepsList currentStepIndex={1} />
-      </StepListWrapper>
-      <CardWrapper>
-        <ChooseDestinationContainer />
-      </CardWrapper>
-    </PageContainer>
+    <>
+      <SideMenuWrapper>
+        <SideMenu currentStep={3} />
+      </SideMenuWrapper>
+      <ChooseDestinationContainer />
+    </>
   );
 }
diff --git a/frontend/webapp/app/(setup)/choose-sources/page.tsx b/frontend/webapp/app/(setup)/choose-sources/page.tsx
index 495ec2f21..a612ab2ae 100644
--- a/frontend/webapp/app/(setup)/choose-sources/page.tsx
+++ b/frontend/webapp/app/(setup)/choose-sources/page.tsx
@@ -1,18 +1,16 @@
 'use client';
 import React from 'react';
-import { StepsList } from '@/components';
-import { ChooseSourcesContainer } from '@/containers';
-import { CardWrapper, PageContainer, StepListWrapper } from '../styled';
+import { SideMenu } from '@/components';
+import { ChooseSourcesContainer } from '@/containers/main';
+import { SideMenuWrapper } from '../styled';
 
 export default function ChooseSourcesPage() {
   return (
-    <PageContainer>
-      <StepListWrapper>
-        <StepsList currentStepIndex={0} />
-      </StepListWrapper>
-      <CardWrapper>
-        <ChooseSourcesContainer />
-      </CardWrapper>
-    </PageContainer>
+    <>
+      <SideMenuWrapper>
+        <SideMenu currentStep={2} />
+      </SideMenuWrapper>
+      <ChooseSourcesContainer />
+    </>
   );
 }
diff --git a/frontend/webapp/app/(setup)/connect-destination/page.tsx b/frontend/webapp/app/(setup)/connect-destination/page.tsx
deleted file mode 100644
index 5217c328c..000000000
--- a/frontend/webapp/app/(setup)/connect-destination/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-'use client';
-import { StepsList } from '@/components';
-import { ConnectDestinationContainer } from '@/containers';
-import { CardWrapper, PageContainer, StepListWrapper } from '../styled';
-
-export default function ConnectDestinationPage() {
-  return (
-    <PageContainer>
-      <StepListWrapper>
-        <StepsList currentStepIndex={2} />
-      </StepListWrapper>
-      <CardWrapper>
-        <ConnectDestinationContainer />
-      </CardWrapper>
-    </PageContainer>
-  );
-}
diff --git a/frontend/webapp/app/(setup)/layout.tsx b/frontend/webapp/app/(setup)/layout.tsx
index d93a42f6f..6e7cab11e 100644
--- a/frontend/webapp/app/(setup)/layout.tsx
+++ b/frontend/webapp/app/(setup)/layout.tsx
@@ -1,7 +1,23 @@
 'use client';
 import React from 'react';
-import Logo from '@/assets/logos/odigos-gradient.svg';
-import { LogoWrapper, SetupPageContainer } from './styled';
+import styled from 'styled-components';
+
+const LayoutContainer = styled.div`
+  width: 100%;
+  height: 100vh;
+  background-color: ${({ theme }) => theme.colors.primary};
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+`;
+
+const MainContent = styled.div`
+  display: flex;
+  max-width: 1440px;
+  width: 100vh;
+  flex-direction: column;
+  align-items: center;
+`;
 
 export default function SetupLayout({
   children,
@@ -9,11 +25,8 @@ export default function SetupLayout({
   children: React.ReactNode;
 }) {
   return (
-    <SetupPageContainer>
-      <LogoWrapper>
-        <Logo />
-      </LogoWrapper>
-      {children}
-    </SetupPageContainer>
+    <LayoutContainer>
+      <MainContent>{children}</MainContent>
+    </LayoutContainer>
   );
 }
diff --git a/frontend/webapp/app/setup/styled.ts b/frontend/webapp/app/(setup)/styled.ts
similarity index 100%
rename from frontend/webapp/app/setup/styled.ts
rename to frontend/webapp/app/(setup)/styled.ts
diff --git a/frontend/webapp/app/(setup)/styled.tsx b/frontend/webapp/app/(setup)/styled.tsx
deleted file mode 100644
index 4e3e49040..000000000
--- a/frontend/webapp/app/(setup)/styled.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import styled from 'styled-components';
-
-export const SetupPageContainer = styled.div`
-  width: 100vw;
-  height: 100vh;
-
-  background: var(
-    --gradient-dark,
-    radial-gradient(
-      44.09% 58.18% at 100% -14%,
-      rgba(150, 242, 255, 0.4) 0%,
-      rgba(150, 242, 255, 0) 61.91%
-    ),
-    linear-gradient(181deg, #091824 0%, #2b2f56 100%)
-  );
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-`;
-
-export const LogoWrapper = styled.div`
-  position: absolute;
-  top: 20px;
-  left: 20px;
-`;
-
-export const StepListWrapper = styled.div`
-  height: 5%;
-  padding: 32px;
-  width: 100%;
-  display: inline-flex;
-  justify-content: center;
-`;
-
-export const PageContainer = styled.div`
-  height: 100vh;
-`;
-
-export const CardWrapper = styled.div`
-  height: 85%;
-`;
diff --git a/frontend/webapp/app/setup/choose-destination/page.tsx b/frontend/webapp/app/setup/choose-destination/page.tsx
deleted file mode 100644
index 07187db2a..000000000
--- a/frontend/webapp/app/setup/choose-destination/page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-'use client';
-import React from 'react';
-import { SideMenu } from '@/components';
-import { SideMenuWrapper } from '../styled';
-import { ChooseDestinationContainer } from '@/containers/main';
-
-export default function ChooseDestinationPage() {
-  return (
-    <>
-      <SideMenuWrapper>
-        <SideMenu currentStep={3} />
-      </SideMenuWrapper>
-      <ChooseDestinationContainer />
-    </>
-  );
-}
diff --git a/frontend/webapp/app/setup/choose-sources/page.tsx b/frontend/webapp/app/setup/choose-sources/page.tsx
deleted file mode 100644
index a612ab2ae..000000000
--- a/frontend/webapp/app/setup/choose-sources/page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-'use client';
-import React from 'react';
-import { SideMenu } from '@/components';
-import { ChooseSourcesContainer } from '@/containers/main';
-import { SideMenuWrapper } from '../styled';
-
-export default function ChooseSourcesPage() {
-  return (
-    <>
-      <SideMenuWrapper>
-        <SideMenu currentStep={2} />
-      </SideMenuWrapper>
-      <ChooseSourcesContainer />
-    </>
-  );
-}
diff --git a/frontend/webapp/app/setup/layout.tsx b/frontend/webapp/app/setup/layout.tsx
deleted file mode 100644
index 6e7cab11e..000000000
--- a/frontend/webapp/app/setup/layout.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-'use client';
-import React from 'react';
-import styled from 'styled-components';
-
-const LayoutContainer = styled.div`
-  width: 100%;
-  height: 100vh;
-  background-color: ${({ theme }) => theme.colors.primary};
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-`;
-
-const MainContent = styled.div`
-  display: flex;
-  max-width: 1440px;
-  width: 100vh;
-  flex-direction: column;
-  align-items: center;
-`;
-
-export default function SetupLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <LayoutContainer>
-      <MainContent>{children}</MainContent>
-    </LayoutContainer>
-  );
-}
diff --git a/frontend/webapp/components/destinations/monitors-tap-list/index.tsx b/frontend/webapp/components/destinations/monitors-tap-list/index.tsx
index 198ea3471..fbc4685b4 100644
--- a/frontend/webapp/components/destinations/monitors-tap-list/index.tsx
+++ b/frontend/webapp/components/destinations/monitors-tap-list/index.tsx
@@ -31,6 +31,7 @@ const MonitorsTapList: React.FC<MonitorButtonsProps> = ({
       <MonitorButtonsContainer>
         {MONITORS_OPTIONS.map((monitor) => (
           <Tag
+            key={monitor.id}
             id={monitor.id}
             isSelected={selectedMonitors.includes(monitor.id)}
             onClick={() => onMonitorSelect(monitor.id)}
diff --git a/frontend/webapp/containers/main/sources/choose-sources/index.tsx b/frontend/webapp/containers/main/sources/choose-sources/index.tsx
index 6228bea41..6430c1ad7 100644
--- a/frontend/webapp/containers/main/sources/choose-sources/index.tsx
+++ b/frontend/webapp/containers/main/sources/choose-sources/index.tsx
@@ -61,7 +61,7 @@ export function ChooseSourcesContainer() {
       dispatch(setSources(selectedItems));
       dispatch(setNamespaceFutureSelectAppsList(futureAppsCheckbox));
     }
-    router.push('/setup/choose-destination');
+    router.push('/choose-destination');
   }
 
   const toggleCheckboxState: ToggleCheckboxState = {