diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27afdc7b9..9e6a3fa48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@
   - Add missing translations, fix duplicate error
 - Service Release Process
   - fixed conformity document deletion issue after uploading document
+- Company roles
+  - Show standard library infomration based on the selected company role
 - Invite Business Partner
   - fix loading button issue to invite multiple companies in succession
 
diff --git a/src/components/pages/CompanyRoles/index.tsx b/src/components/pages/CompanyRoles/index.tsx
index dfb13c2d7..6b637e8a6 100644
--- a/src/components/pages/CompanyRoles/index.tsx
+++ b/src/components/pages/CompanyRoles/index.tsx
@@ -34,6 +34,13 @@ import {
   useFetchStandardLibraryQuery,
 } from 'features/staticContent/staticContentApiSlice'
 
+enum URLs {
+  companyrolesappprovider = 'companyrolesappprovider',
+  companyrolesserviceprovider = 'companyrolesserviceprovider',
+  companyrolesconformitybody = 'companyrolesconformitybody',
+  companyrolesonboardingserviceprovider = 'companyrolesonboardingserviceprovider',
+}
+
 export default function CompanyRoles() {
   const [companyRoles, setCompanyRoles] = useState<CompanyType>()
   const [stdJson, setStdJson] = useState<StandardLibraryType>()
@@ -45,29 +52,42 @@ export default function CompanyRoles() {
   const { data: standardLibraryResponse } = useFetchStandardLibraryQuery()
 
   useEffect(() => {
-    if (companyRolesResponse) {
-      if (url.indexOf('companyrolesappprovider') > 1) {
+    const roles = []
+    if (companyRolesResponse && standardLibraryResponse) {
+      if (url.includes(URLs.companyrolesappprovider)) {
         setCompanyRoles(companyRolesResponse.appProvider)
         setLinkArray(companyRolesResponse.appProvider.subNavigation)
-      } else if (url.indexOf('companyrolesserviceprovider') > 1) {
+        roles.push(3)
+      } else if (url.includes(URLs.companyrolesserviceprovider)) {
         setCompanyRoles(companyRolesResponse.serviceProvider)
         setLinkArray(companyRolesResponse.serviceProvider.subNavigation)
-      } else if (url.indexOf('companyrolesconformitybody') > 1) {
+        roles.push(2)
+      } else if (url.includes(URLs.companyrolesconformitybody)) {
         setCompanyRoles(companyRolesResponse.conformity)
         setLinkArray(companyRolesResponse.conformity.subNavigation)
-      } else if (url.indexOf('companyrolesonboardingserviceprovider') > 1) {
+      } else if (url.includes(URLs.companyrolesonboardingserviceprovider)) {
         setCompanyRoles(companyRolesResponse.ospProvider)
         setLinkArray(companyRolesResponse.ospProvider.subNavigation)
+        roles.push(15)
       } else {
         setCompanyRoles(companyRolesResponse.participant)
         setLinkArray(companyRolesResponse.participant.subNavigation)
+        roles.push(6)
       }
+      setStdJson({
+        ...standardLibraryResponse,
+        rows: getFiltered(standardLibraryResponse, roles),
+      })
     }
-  }, [url, language, companyRolesResponse])
+  }, [url, language, companyRolesResponse, standardLibraryResponse])
 
-  useEffect(() => {
-    setStdJson(standardLibraryResponse)
-  }, [language, standardLibraryResponse])
+  const intersect = (a: number[], b: number[]) =>
+    a.filter((value: number) => b.includes(value))
+
+  const getFiltered = (std: StandardLibraryType, cr: number[]) =>
+    std.rows.filter(
+      (row: { roles: number[] }) => intersect(row.roles, cr).length > 0
+    )
 
   const scrollStarted = () => {
     setTopReached(window.scrollY > 500)
diff --git a/src/components/shared/templates/Templates.scss b/src/components/shared/templates/Templates.scss
index 0c4f8707c..87c7c8808 100644
--- a/src/components/shared/templates/Templates.scss
+++ b/src/components/shared/templates/Templates.scss
@@ -28,7 +28,7 @@
   width: 100%;
   justify-content: flex-start;
   padding-left: 160px;
-  padding-right: 80px;
+  padding-right: 160px;
 
   h4 {
     font-size: 16px;
@@ -37,8 +37,9 @@
 }
 
 .subNavigationContainer button {
-  margin-right: 20px;
-  text-align: left;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 }
 
 .customHeight {