diff --git a/frontend/src/container/CloudIntegrationPage/CloudIntegrationPage.tsx b/frontend/src/container/CloudIntegrationPage/CloudIntegrationPage.tsx
index 488202feaa88..44b35908c6d1 100644
--- a/frontend/src/container/CloudIntegrationPage/CloudIntegrationPage.tsx
+++ b/frontend/src/container/CloudIntegrationPage/CloudIntegrationPage.tsx
@@ -14,7 +14,7 @@ function CloudIntegrationPage(): JSX.Element {
 			<HeroSection />
 			<RequestIntegrationBtn
 				type={IntegrationType.AWS_SERVICES}
-				message="Cannot find the AWS service you're looking for? Request more integrations"
+				message="Can't find the AWS service you're looking for? Request more integrations"
 			/>
 			<ServicesTabs />
 		</div>
diff --git a/frontend/src/container/CloudIntegrationPage/ServicesSection/CloudServiceDataCollected.tsx b/frontend/src/container/CloudIntegrationPage/ServicesSection/CloudServiceDataCollected.tsx
index b34625559ba2..a7eae903e925 100644
--- a/frontend/src/container/CloudIntegrationPage/ServicesSection/CloudServiceDataCollected.tsx
+++ b/frontend/src/container/CloudIntegrationPage/ServicesSection/CloudServiceDataCollected.tsx
@@ -60,26 +60,30 @@ function CloudServiceDataCollected({
 
 	return (
 		<div className="cloud-service-data-collected">
-			<div className="cloud-service-data-collected__table">
-				<div className="cloud-service-data-collected__table-heading">Logs</div>
-				<Table
-					columns={logsColumns}
-					dataSource={logsData}
-					// eslint-disable-next-line react/jsx-props-no-spreading
-					{...tableProps}
-					className="cloud-service-data-collected__table-logs"
-				/>
-			</div>
-			<div className="cloud-service-data-collected__table">
-				<div className="cloud-service-data-collected__table-heading">Metrics</div>
-				<Table
-					columns={metricsColumns}
-					dataSource={metricsData}
-					// eslint-disable-next-line react/jsx-props-no-spreading
-					{...tableProps}
-					className="cloud-service-data-collected__table-metrics"
-				/>
-			</div>
+			{logsData && logsData.length > 0 && (
+				<div className="cloud-service-data-collected__table">
+					<div className="cloud-service-data-collected__table-heading">Logs</div>
+					<Table
+						columns={logsColumns}
+						dataSource={logsData}
+						// eslint-disable-next-line react/jsx-props-no-spreading
+						{...tableProps}
+						className="cloud-service-data-collected__table-logs"
+					/>
+				</div>
+			)}
+			{metricsData && metricsData.length > 0 && (
+				<div className="cloud-service-data-collected__table">
+					<div className="cloud-service-data-collected__table-heading">Metrics</div>
+					<Table
+						columns={metricsColumns}
+						dataSource={metricsData}
+						// eslint-disable-next-line react/jsx-props-no-spreading
+						{...tableProps}
+						className="cloud-service-data-collected__table-metrics"
+					/>
+				</div>
+			)}
 		</div>
 	);
 }
diff --git a/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx b/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
index 56b9edc90495..12fcc819fc7a 100644
--- a/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
+++ b/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
@@ -51,6 +51,33 @@ function ServiceStatus({
 	return <div className={`service-status ${className}`}>{text}</div>;
 }
 
+function getTabItems(serviceDetailsData: any): TabsProps['items'] {
+	const dashboards = serviceDetailsData?.assets.dashboards || [];
+	const dataCollected = serviceDetailsData?.data_collected || {};
+	const items: TabsProps['items'] = [];
+
+	if (dashboards.length) {
+		items.push({
+			key: 'dashboards',
+			label: `Dashboards (${dashboards.length})`,
+			children: <CloudServiceDashboards service={serviceDetailsData} />,
+		});
+	}
+
+	items.push({
+		key: 'data-collected',
+		label: 'Data Collected',
+		children: (
+			<CloudServiceDataCollected
+				logsData={dataCollected.logs || []}
+				metricsData={dataCollected.metrics || []}
+			/>
+		),
+	});
+
+	return items;
+}
+
 function ServiceDetails(): JSX.Element | null {
 	const urlQuery = useUrlQuery();
 	const cloudAccountId = urlQuery.get('cloudAccountId');
@@ -106,23 +133,7 @@ function ServiceDetails(): JSX.Element | null {
 		return null;
 	}
 
-	const tabItems: TabsProps['items'] = [
-		{
-			key: 'dashboards',
-			label: `Dashboards (${serviceDetailsData?.assets.dashboards.length})`,
-			children: <CloudServiceDashboards service={serviceDetailsData} />,
-		},
-		{
-			key: 'data-collected',
-			label: 'Data Collected',
-			children: (
-				<CloudServiceDataCollected
-					logsData={serviceDetailsData?.data_collected.logs || []}
-					metricsData={serviceDetailsData?.data_collected.metrics || []}
-				/>
-			),
-		},
-	];
+	const tabItems = getTabItems(serviceDetailsData);
 
 	return (
 		<div className="service-details">
diff --git a/frontend/src/container/CloudIntegrationPage/__tests__/RequestIntegration.test.tsx b/frontend/src/container/CloudIntegrationPage/__tests__/RequestIntegration.test.tsx
index 9872f431015e..ff34af3f8f36 100644
--- a/frontend/src/container/CloudIntegrationPage/__tests__/RequestIntegration.test.tsx
+++ b/frontend/src/container/CloudIntegrationPage/__tests__/RequestIntegration.test.tsx
@@ -34,7 +34,7 @@ describe('Request AWS integration', () => {
 
 		expect(
 			screen.getByText(
-				/cannot find what you’re looking for\? request more integrations/i,
+				/can't find what you’re looking for\? request more integrations/i,
 			),
 		).toBeInTheDocument();
 
diff --git a/frontend/src/container/ListOfDashboard/RequestDashboardBtn.tsx b/frontend/src/container/ListOfDashboard/RequestDashboardBtn.tsx
index a2e09463ac09..756dc953e3cb 100644
--- a/frontend/src/container/ListOfDashboard/RequestDashboardBtn.tsx
+++ b/frontend/src/container/ListOfDashboard/RequestDashboardBtn.tsx
@@ -58,7 +58,14 @@ export function RequestDashboardBtn(): JSX.Element {
 	return (
 		<div className="request-entity-container">
 			<Typography.Text>
-				Can&apos;t find the dashboard you need? Request a new Dashboard.
+				<a
+					href="https://github.com/SigNoz/dashboards"
+					target="_blank"
+					rel="noopener noreferrer"
+				>
+					Browse dashboard templates
+				</a>{' '}
+				or Request new template →
 			</Typography.Text>
 
 			<div className="form-section">
diff --git a/frontend/src/pages/Integrations/RequestIntegrationBtn.tsx b/frontend/src/pages/Integrations/RequestIntegrationBtn.tsx
index 8fdea40413bd..1c32df3765ae 100644
--- a/frontend/src/pages/Integrations/RequestIntegrationBtn.tsx
+++ b/frontend/src/pages/Integrations/RequestIntegrationBtn.tsx
@@ -116,5 +116,5 @@ export function RequestIntegrationBtn({
 
 RequestIntegrationBtn.defaultProps = {
 	type: IntegrationType.INTEGRATIONS_LIST,
-	message: 'Cannot find what you’re looking for? Request more integrations',
+	message: "Can't find what you’re looking for? Request more integrations",
 };