diff --git a/frontend/src/container/AppLayout/index.tsx b/frontend/src/container/AppLayout/index.tsx
index 7806ecfc13..901e2b36d8 100644
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@@ -315,7 +315,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 				className={cx(
 					'app-layout',
 					isDarkMode ? 'darkMode' : 'lightMode',
-					!collapsed ? 'docked' : '',
+					!collapsed && !renderFullScreen ? 'docked' : '',
 				)}
 			>
 				{isToDisplayLayout && !renderFullScreen && (
diff --git a/frontend/src/container/OnboardingContainer/Steps/EnvironmentDetails/EnvironmentDetails.tsx b/frontend/src/container/OnboardingContainer/Steps/EnvironmentDetails/EnvironmentDetails.tsx
index fe53a1adb1..60ecf403bf 100644
--- a/frontend/src/container/OnboardingContainer/Steps/EnvironmentDetails/EnvironmentDetails.tsx
+++ b/frontend/src/container/OnboardingContainer/Steps/EnvironmentDetails/EnvironmentDetails.tsx
@@ -159,7 +159,7 @@ export default function EnvironmentDetails(): JSX.Element {
 
 			<div className="request-entity-container">
 				<Typography.Text>
-					Cannot find what you’re looking for? Request a data source
+					Cannot find what you’re looking for? Request an environment
 				</Typography.Text>
 
 				<div className="form-section">
diff --git a/frontend/src/container/OnboardingContainer/common/ModuleStepsContainer/ModuleStepsContainer.tsx b/frontend/src/container/OnboardingContainer/common/ModuleStepsContainer/ModuleStepsContainer.tsx
index 662daedeaa..91df3591c4 100644
--- a/frontend/src/container/OnboardingContainer/common/ModuleStepsContainer/ModuleStepsContainer.tsx
+++ b/frontend/src/container/OnboardingContainer/common/ModuleStepsContainer/ModuleStepsContainer.tsx
@@ -17,6 +17,7 @@ import { hasFrameworks } from 'container/OnboardingContainer/utils/dataSourceUti
 import useAnalytics from 'hooks/analytics/useAnalytics';
 import history from 'lib/history';
 import { isEmpty, isNull } from 'lodash-es';
+import { HelpCircle } from 'lucide-react';
 import { useState } from 'react';
 
 import { useOnboardingContext } from '../../context/OnboardingContext';
@@ -379,6 +380,30 @@ export default function ModuleStepsContainer({
 		history.push('/');
 	};
 
+	const handleFacingIssuesClick = (): void => {
+		trackEvent('Onboarding V2: Facing Issues Sending Data to SigNoz', {
+			dataSource: selectedDataSource?.id,
+			framework: selectedFramework,
+			environment: selectedEnvironment,
+			module: activeStep?.module?.id,
+		});
+
+		const message = `Hi Team,
+
+I am facing issues sending data to SigNoz. Here are my application details
+
+Data Source: ${selectedDataSource?.name}
+Framework:
+Environment:
+Module: ${activeStep?.module?.id}
+
+Thanks
+`;
+		if (window.Intercom) {
+			window.Intercom('showNewMessage', message);
+		}
+	};
+
 	return (
 		<div className="onboarding-module-steps">
 			<div className="steps-container">
@@ -455,6 +480,15 @@ export default function ModuleStepsContainer({
 					<Button onClick={handleNext} type="primary" icon={<ArrowRightOutlined />}>
 						{current < lastStepIndex ? 'Continue to next step' : 'Done'}
 					</Button>
+
+					<Button
+						className="periscope-btn"
+						onClick={handleFacingIssuesClick}
+						danger
+						icon={<HelpCircle size={14} />}
+					>
+						Facing issues sending data to SigNoz?
+					</Button>
 				</div>
 			</div>
 		</div>
diff --git a/frontend/src/container/TracesExplorer/Controls/styles.ts b/frontend/src/container/TracesExplorer/Controls/styles.ts
index d9810d1f4c..9e205dbde7 100644
--- a/frontend/src/container/TracesExplorer/Controls/styles.ts
+++ b/frontend/src/container/TracesExplorer/Controls/styles.ts
@@ -5,4 +5,5 @@ export const Container = styled.div`
 	align-items: center;
 	justify-content: flex-end;
 	gap: 0.3rem;
+	margin: 8px 0;
 `;
diff --git a/frontend/src/container/TracesExplorer/ListView/styles.ts b/frontend/src/container/TracesExplorer/ListView/styles.ts
index 9410a9b90e..2272276347 100644
--- a/frontend/src/container/TracesExplorer/ListView/styles.ts
+++ b/frontend/src/container/TracesExplorer/ListView/styles.ts
@@ -9,7 +9,6 @@ export const tableStyles: CSSProperties = {
 export const Container = styled.div`
 	display: flex;
 	flex-direction: column;
-	gap: 15px;
 `;
 
 export const ErrorText = styled(Typography)`
diff --git a/frontend/src/container/TracesExplorer/TracesView/styles.ts b/frontend/src/container/TracesExplorer/TracesView/styles.ts
index f9c9a7c8ea..5acf6309a6 100644
--- a/frontend/src/container/TracesExplorer/TracesView/styles.ts
+++ b/frontend/src/container/TracesExplorer/TracesView/styles.ts
@@ -3,7 +3,6 @@ import styled from 'styled-components';
 export const Container = styled.div`
 	display: flex;
 	flex-direction: column;
-	gap: 15px;
 `;
 
 export const ActionsContainer = styled.div`