diff --git a/src/components/Assets/AssetList/index.tsx b/src/components/Assets/AssetList/index.tsx
index 801d990b6..d2213c271 100644
--- a/src/components/Assets/AssetList/index.tsx
+++ b/src/components/Assets/AssetList/index.tsx
@@ -290,7 +290,10 @@ export const AssetList = (props: AssetListProps) => {
         .map((entryId) => {
           const entries = props.entries[entryId];
           return entries.map((entry) => {
-            const relatedServices = entries.map((entry) => entry.serviceName);
+            const relatedServices = entries
+              .map((entry) => entry.serviceName)
+              .filter((x, i, arr) => arr.indexOf(x) === i);
+
             return {
               ...entry,
               id: entryId,
@@ -388,9 +391,17 @@ export const AssetList = (props: AssetListProps) => {
       {sortedEntries.length > 0 ? (
         <s.List>
           {sortedEntries.map((entry) => {
+            const key = [
+              entry.serviceName,
+              entry.endpointCodeObjectId,
+              entry.span.spanCodeObjectId
+            ]
+              .filter(Boolean)
+              .join("|_|");
+
             return (
               <AssetEntryComponent
-                key={`${entry.id}-${entry.serviceName}`}
+                key={key}
                 entry={entry}
                 onAssetLinkClick={handleAssetLinkClick}
               />
diff --git a/src/components/RecentActivity/index.tsx b/src/components/RecentActivity/index.tsx
index 692414d52..437e696ba 100644
--- a/src/components/RecentActivity/index.tsx
+++ b/src/components/RecentActivity/index.tsx
@@ -30,7 +30,7 @@ const actions = addPrefix(ACTION_PREFIX, {
   CLOSE_LIVE_VIEW: "CLOSE_LIVE_VIEW"
 });
 
-const handleTroubleshootingLinkClick = () => {
+const handleTroubleshootButtonClick = () => {
   sendTrackingEvent(globalTrackingEvents.TROUBLESHOOTING_LINK_CLICKED, {
     origin: "recent activity"
   });
@@ -46,14 +46,11 @@ const renderNoData = () => {
       <CursorFollower>
         <DigmaLogoFlatIcon size={64} />
       </CursorFollower>
-      <s.NoDataTitle>No Data Yet</s.NoDataTitle>
-      <s.NoDataText>
-        Trigger actions that call this application to learn more about its
-        runtime behavior
-      </s.NoDataText>
-      <s.TroubleshootingLink onClick={handleTroubleshootingLinkClick}>
-        Not seeing your application data?
-      </s.TroubleshootingLink>
+      <s.NoDataTitle>No Recent Activity</s.NoDataTitle>
+      <s.NoDataText>Not seeing your application data?</s.NoDataText>
+      <s.TroubleshootButton onClick={handleTroubleshootButtonClick}>
+        Troubleshoot
+      </s.TroubleshootButton>
     </s.NoDataContainer>
   );
 };
diff --git a/src/components/RecentActivity/styles.ts b/src/components/RecentActivity/styles.ts
index b828d6b5b..dcd685a11 100644
--- a/src/components/RecentActivity/styles.ts
+++ b/src/components/RecentActivity/styles.ts
@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { Link } from "../common/Link";
+import { Button } from "../common/Button";
 
 export const Container = styled.div`
   height: 100%;
@@ -113,19 +113,8 @@ export const NoDataText = styled.span`
   }};
 `;
 
-export const TroubleshootingLink = styled(Link)`
-  font-size: 14px;
-  line-height: 16px;
-  text-decoration: none;
-  color: ${({ theme }) => {
-    switch (theme.mode) {
-      case "light":
-        return "#426dda";
-      case "dark":
-      case "dark-jetbrains":
-        return "#7891d0";
-    }
-  }};
+export const TroubleshootButton = styled(Button)`
+  margin-top: 8px;
 `;
 
 export const LiveViewContainer = styled.div`