diff --git a/meteor/client/lib/metrics.js b/meteor/client/lib/metrics.js
index b161c59d6d..9f586ea768 100644
--- a/meteor/client/lib/metrics.js
+++ b/meteor/client/lib/metrics.js
@@ -13,7 +13,7 @@ Metrics.trackEvent = function (name) {
   if (!name) {
     return;
   }
-  var uuid = localStorage.getItem('metrics.userId');
+  var uuid = localStorage.getItem('metrics.uuid');
   if (localStorage.getItem('metrics.enabled') && uuid) {
     mixpanel.track('docker_gui ' + name, {
       distinct_id: uuid,
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html
index 08a1d7e4ed..61449e019b 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.html
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html
@@ -52,9 +52,9 @@
           {{/if}}
         {{/if}}
       {{/if}}
-      <a href="#" onclick="Metrics.trackEvent('container open volume directory')" class="btn-icon btn-folder" data-toggle="tooltip" data-placement="bottom" title="Volumes"><span class="typcn typcn-folder"></span></a>
+      <a href="#" onclick="Metrics.trackEvent('container volume directory')" class="btn-icon btn-folder" data-toggle="tooltip" data-placement="bottom" title="Volumes"><span class="typcn typcn-folder"></span></a>
       {{#if $eq status 'READY'}}
-        <a href="#" onclick="Metrics.trackEvent('container open terminal')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
+        <a href="#" onclick="Metrics.trackEvent('container terminal')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
         <a href="#" onclick="Metrics.trackEvent('container stop')" class="btn-icon btn-stop" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-stop-outline"></span></a>
       {{/if}}
       {{#if $eq status 'STOPPED'}}
@@ -63,8 +63,8 @@
       {{#unless changingState}}
       <a href="#" onclick="Metrics.trackEvent('container restart')" class="btn-icon btn-restart" data-toggle="tooltip" data-placement="bottom" title="Restart"><span class="typcn typcn-refresh-outline"></span></a>
       {{/unless}}
-      <a href="/apps/{{name}}/logs" onclick="Metrics.trackEvent('container open logs')" class="btn-icon btn-logs" data-toggle="tooltip" data-placement="bottom" title="Logs"><span class="typcn typcn-document-text"></span></a>
-      <a href="/apps/{{name}}/settings" onclick="Metrics.trackEvent('container open settings')" class="btn-icon" data-toggle="tooltip" data-placement="bottom" title="Settings"><span class="typcn typcn-cog-outline"></span></a>
+      <a href="/apps/{{name}}/logs" onclick="Metrics.trackEvent('container logs')" class="btn-icon btn-logs" data-toggle="tooltip" data-placement="bottom" title="Logs"><span class="typcn typcn-document-text"></span></a>
+      <a href="/apps/{{name}}/settings" onclick="Metrics.trackEvent('container settings')" class="btn-icon" data-toggle="tooltip" data-placement="bottom" title="Settings"><span class="typcn typcn-cog-outline"></span></a>
     </div>
   </div>
 </template>
diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.html b/meteor/client/views/dashboard/images/dashboard-single-image.html
index 0639052d73..8add58d1c8 100755
--- a/meteor/client/views/dashboard/images/dashboard-single-image.html
+++ b/meteor/client/views/dashboard/images/dashboard-single-image.html
@@ -32,7 +32,7 @@
         {{/if}}
       {{/if}}
       {{#if path}}
-        <a onclick="Metrics.trackEvent('image open directory')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
+        <a onclick="Metrics.trackEvent('image directory')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
       {{/if}}
       {{#if $neq status 'BUILDING'}}
         {{#if path}}
diff --git a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
index 2390091820..bf07253d6f 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
@@ -17,7 +17,7 @@
                     <a onclick="Metrics.trackEvent('container details view image details')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
                   {{/if}}
                 {{/if}}
-                <a onclick="Metrics.trackEvent('container details open volume directory')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
+                <a onclick="Metrics.trackEvent('container details volume directory')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{#if $eq status 'READY'}}
                   <a href="#" onclick="Metrics.trackEvent('container details stop')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-stop-outline"></span></a>
                 {{/if}}
diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
index 20a029c410..3408216041 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
@@ -13,11 +13,11 @@
               <span class="icons">
                 {{#if $eq status 'READY'}}
                   {{#if hasExposedPort}}
-                    <a onclick="Metrics.trackEvent('image details create container')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
+                    <a onclick="Metrics.trackEvent('image details container')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
                   {{/if}}
                 {{/if}}
                 {{#if path}}
-                  <a onclick="Metrics.trackEvent('image details open directory')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
+                  <a onclick="Metrics.trackEvent('image details directory')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{/if}}
                 {{#if $neq status 'BUILDING'}}
                   {{#if path}}