diff --git a/web/app/js/components/Sidebar.jsx b/web/app/js/components/Sidebar.jsx
index df3b5644f..1e8d5409b 100644
--- a/web/app/js/components/Sidebar.jsx
+++ b/web/app/js/components/Sidebar.jsx
@@ -162,6 +162,13 @@ class Sidebar extends React.Component {
               </PrefixedLink>
             </Menu.Item>
 
+            <Menu.Item className="sidebar-menu-item" key="/top">
+              <PrefixedLink to="/top">
+                <Icon type="caret-up" />
+                <span>Top</span>
+              </PrefixedLink>
+            </Menu.Item>
+
             {
               _.map(_.take(this.state.namespaces, this.state.maxNsItemsToShow), ns => {
                 return (
diff --git a/web/app/js/components/TapEventTable.jsx b/web/app/js/components/TapEventTable.jsx
index b7dfb87cf..c28b0d7f2 100644
--- a/web/app/js/components/TapEventTable.jsx
+++ b/web/app/js/components/TapEventTable.jsx
@@ -191,7 +191,7 @@ const renderMetaLabels = (title, labels) => {
         columns={srcDstMetaColumns}
         dataSource={data}
         size="small"
-        rowKey="labelVal"
+        rowKey={row => title.replace(" ", "_") + row.labelName + row.labelVal}
         bordered={false}
         showHeader={false}
         pagination={false} />