diff --git a/src/screens/Analytics/Analytics.res b/src/screens/Analytics/Analytics.res
index 9decef4ce..987c3905b 100644
--- a/src/screens/Analytics/Analytics.res
+++ b/src/screens/Analytics/Analytics.res
@@ -465,7 +465,6 @@ open AnalyticsTypes
 @react.component
 let make = (
   ~pageTitle="",
-  ~pageSubTitle="",
   ~startTimeFilterKey: string,
   ~endTimeFilterKey: string,
   ~chartEntity: nestedEntityType,
@@ -679,7 +678,7 @@ let make = (
     | Some(chartEntity) =>
       <div>
         <div className="flex items-center justify-between">
-          <PageUtils.PageHeading title=pageTitle subTitle=pageSubTitle />
+          <PageUtils.PageHeading title=pageTitle />
           // Refactor required
           <RenderIf condition={moduleName == "Refunds" || moduleName == "Disputes"}>
             <OMPSwitchHelper.OMPViews
diff --git a/src/screens/Analytics/AuthenticationAnalytics/AuthenticationAnalytics.res b/src/screens/Analytics/AuthenticationAnalytics/AuthenticationAnalytics.res
index 9543beded..595bf4940 100644
--- a/src/screens/Analytics/AuthenticationAnalytics/AuthenticationAnalytics.res
+++ b/src/screens/Analytics/AuthenticationAnalytics/AuthenticationAnalytics.res
@@ -57,13 +57,11 @@ let make = () => {
   })
 
   let title = "Authentication Analytics"
-  let subTitle = "Know more about how well your users are able to authenticate payments"
 
   <div>
-    <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+    <PageLoaderWrapper screenState customUI={<NoData title />}>
       <Analytics
         pageTitle=title
-        pageSubTitle=subTitle
         filterUri=None
         key="AuthenticationAnalytics"
         moduleName="Authentication"
diff --git a/src/screens/Analytics/DisputeAnalytics/DisputeAnalytics.res b/src/screens/Analytics/DisputeAnalytics/DisputeAnalytics.res
index 86ff937a5..428807c07 100644
--- a/src/screens/Analytics/DisputeAnalytics/DisputeAnalytics.res
+++ b/src/screens/Analytics/DisputeAnalytics/DisputeAnalytics.res
@@ -43,17 +43,16 @@ let make = () => {
   })
 
   let title = "Disputes Analytics"
-  let subTitle = "Gain Insights, monitor performance and make Informed Decisions with Dispute Analytics."
+
   let analyticsfilterUrl = getURL(~entityName=ANALYTICS_FILTERS, ~methodType=Post, ~id=Some(domain))
   let disputeAnalyticsUrl = getURL(
     ~entityName=ANALYTICS_PAYMENTS,
     ~methodType=Post,
     ~id=Some(domain),
   )
-  <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+  <PageLoaderWrapper screenState customUI={<NoData title />}>
     <Analytics
       pageTitle=title
-      pageSubTitle=subTitle
       filterUri=Some(analyticsfilterUrl)
       key="DisputesAnalytics"
       moduleName="Disputes"
diff --git a/src/screens/Analytics/HSAnalyticsUtils.res b/src/screens/Analytics/HSAnalyticsUtils.res
index 063bb29a2..41142ba61 100644
--- a/src/screens/Analytics/HSAnalyticsUtils.res
+++ b/src/screens/Analytics/HSAnalyticsUtils.res
@@ -175,9 +175,9 @@ let getStringListFromArrayDict = metrics => {
 
 module NoData = {
   @react.component
-  let make = (~title, ~subTitle) => {
+  let make = (~title) => {
     <div className="p-5">
-      <PageUtils.PageHeading title subTitle />
+      <PageUtils.PageHeading title />
       <NoDataFound message="No Data Available" renderType=Painting>
         <Button
           text={"Make a Payment"}
diff --git a/src/screens/Analytics/PaymentsAnalytics/PaymentAnalytics.res b/src/screens/Analytics/PaymentsAnalytics/PaymentAnalytics.res
index 27d414c07..b1a5fc1c4 100644
--- a/src/screens/Analytics/PaymentsAnalytics/PaymentAnalytics.res
+++ b/src/screens/Analytics/PaymentsAnalytics/PaymentAnalytics.res
@@ -126,7 +126,6 @@ let make = () => {
   }
 
   let title = "Payments Analytics"
-  let subTitle = "Gain Insights, monitor performance and make Informed Decisions with Payment Analytics."
 
   let formaPayload = (singleStatBodyEntity: DynamicSingleStat.singleStatBodyEntity) => {
     [
@@ -234,10 +233,10 @@ let make = () => {
   }
 
   open AnalyticsNew
-  <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+  <PageLoaderWrapper screenState customUI={<NoData title />}>
     <div className="flex flex-col gap-5">
       <div className="flex items-center justify-between ">
-        <PageUtils.PageHeading title subTitle />
+        <PageUtils.PageHeading title />
         <OMPSwitchHelper.OMPViews
           views={OMPSwitchUtils.analyticsViewList(~checkUserEntity)}
           selectedEntity={analyticsEntity}
diff --git a/src/screens/Analytics/RefundsAnalytics/RefundsAnalytics.res b/src/screens/Analytics/RefundsAnalytics/RefundsAnalytics.res
index 5a2a06ee2..747136220 100644
--- a/src/screens/Analytics/RefundsAnalytics/RefundsAnalytics.res
+++ b/src/screens/Analytics/RefundsAnalytics/RefundsAnalytics.res
@@ -65,7 +65,6 @@ let make = () => {
   })
 
   let title = "Refunds Analytics"
-  let subTitle = "Uncover patterns and drive business performance through data-driven insights with refund analytics"
 
   let analyticsfilterUrl = getURL(~entityName=ANALYTICS_FILTERS, ~methodType=Post, ~id=Some(domain))
   let refundAnalyticsUrl = getURL(
@@ -73,10 +72,9 @@ let make = () => {
     ~methodType=Post,
     ~id=Some(domain),
   )
-  <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+  <PageLoaderWrapper screenState customUI={<NoData title />}>
     <Analytics
       pageTitle=title
-      pageSubTitle=subTitle
       filterUri=Some(analyticsfilterUrl)
       key="RefundsAnalytics"
       moduleName="Refunds"
diff --git a/src/screens/Analytics/SystemMetrics/SystemMetricsAnalytics.res b/src/screens/Analytics/SystemMetrics/SystemMetricsAnalytics.res
index a870dd4e7..b3a80e17f 100644
--- a/src/screens/Analytics/SystemMetrics/SystemMetricsAnalytics.res
+++ b/src/screens/Analytics/SystemMetrics/SystemMetricsAnalytics.res
@@ -363,17 +363,16 @@ let make = () => {
 
   let tabKeys = getStringListFromArrayDict(dimensions)
   let title = "System Metrics"
-  let subTitle = "Gain Insights, monitor performance and make Informed Decisions with System Metrics."
+
   let analyticsfilterUrl = getURL(~entityName=ANALYTICS_FILTERS, ~methodType=Post, ~id=Some(domain))
   let systemMetricsAnalyticsUrl = getURL(
     ~entityName=ANALYTICS_PAYMENTS,
     ~methodType=Post,
     ~id=Some(domain),
   )
-  <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+  <PageLoaderWrapper screenState customUI={<NoData title />}>
     <SystemMetricsAnalytics
       pageTitle=title
-      pageSubTitle=subTitle
       filterUri={analyticsfilterUrl}
       key="SystemMetrics"
       moduleName="SystemMetrics"
diff --git a/src/screens/Analytics/UserJourneyAnalytics/UserJourneyAnalytics.res b/src/screens/Analytics/UserJourneyAnalytics/UserJourneyAnalytics.res
index ff6e402ef..6cc68c3d5 100644
--- a/src/screens/Analytics/UserJourneyAnalytics/UserJourneyAnalytics.res
+++ b/src/screens/Analytics/UserJourneyAnalytics/UserJourneyAnalytics.res
@@ -57,13 +57,11 @@ let make = () => {
   })
 
   let title = "Know your users"
-  let subTitle = "User Journey analytics is a level deeper into payment analytics and aims at providing you a wholesome understanding of the end users and their usage patterns."
 
   <div>
-    <PageLoaderWrapper screenState customUI={<NoData title subTitle />}>
+    <PageLoaderWrapper screenState customUI={<NoData title />}>
       <Analytics
         pageTitle=title
-        pageSubTitle=subTitle
         filterUri=Some(`${Window.env.apiBaseUrl}/analytics/v1/filters/sdk_events`)
         key="UserJourneyAnalytics"
         moduleName="UserJourney"
diff --git a/src/screens/OMPSwitch/OMPSwitchHelper.res b/src/screens/OMPSwitch/OMPSwitchHelper.res
index 964a3227a..480e2b1e9 100644
--- a/src/screens/OMPSwitch/OMPSwitchHelper.res
+++ b/src/screens/OMPSwitch/OMPSwitchHelper.res
@@ -53,6 +53,7 @@ module OMPViews = {
     ~selectedEntity: UserInfoTypes.entity,
     ~onChange,
   ) => {
+    let {userInfo} = React.useContext(UserInfoProvider.defaultContext)
     let cssBasedOnIndex = index => {
       if index == 0 {
         "rounded-l-md"
@@ -63,6 +64,16 @@ module OMPViews = {
       }
     }
 
+    let getName = entityType =>
+      switch entityType {
+      | #Organization => userInfo.orgId
+      | #Merchant => userInfo.merchantId
+      | #Profile => userInfo.profileId
+      | _ => ""
+      }
+      ->String.substring(~start=0, ~end=10)
+      ->String.concat("...")
+
     <div className="flex h-fit">
       {views
       ->Array.mapWithIndex((value, index) => {
@@ -70,7 +81,7 @@ module OMPViews = {
         <div
           onClick={_ => onChange(value.entity)->ignore}
           className={`text-sm py-2 px-3 ${selectedStyle} border text-blue-500 border-blue-500 ${index->cssBasedOnIndex} cursor-pointer`}>
-          {value.lable->React.string}
+          {`${value.lable} (${value.entity->getName})`->React.string}
         </div>
       })
       ->React.array}
diff --git a/src/screens/OMPSwitch/OMPSwitchUtils.res b/src/screens/OMPSwitch/OMPSwitchUtils.res
index 17d5b428f..dfa5b6dd1 100644
--- a/src/screens/OMPSwitch/OMPSwitchUtils.res
+++ b/src/screens/OMPSwitch/OMPSwitchUtils.res
@@ -54,12 +54,13 @@ let generateDropdownOptions = dropdownList => {
     dropdownList->Array.map((item): SelectBox.dropdownOption => {label: item.name, value: item.id})
   options
 }
+
 let org = {
-  lable: "All Merchant",
+  lable: "Organization",
   entity: #Organization,
 }
 let merchant = {
-  lable: "All Profile",
+  lable: "Merchant",
   entity: #Merchant,
 }
 let profile = {