diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb
index 18aa86d96..5dbcf5faa 100644
--- a/app/assets/javascripts/sitewide/atwho_res.js.erb
+++ b/app/assets/javascripts/sitewide/atwho_res.js.erb
@@ -141,15 +141,21 @@ var SmartAnnotation = (function() {
       });
     }
 
+    // initialise dropdown dismiss button
+    function initDismissButton() {
+      $('.atwho-header-res .dismiss').off('click');
+      $('.atwho-header-res .dismiss').on('click', function() {
+        $(field).atwho('destroy');
+        init();
+      });
+    }
+
     // Initialize filter buttons
     function initButtons(query, search_filter) {
       $('.atwho-header-res query_obj button').off();
       $('.atwho-header-res .dismiss').off('click');
 
-      $('.atwho-header-res .dismiss').on('click', function() {
-        $(field).atwho('destroy');
-        init();
-      });
+      initDismissButton();
 
       resourcesChecker(query, search_filter);
       $('.atwho-header-res .title button').on('click', function(e) {
@@ -290,7 +296,7 @@ var SmartAnnotation = (function() {
       res += map.name;
       res += '</span>';
       if(map.archived) {
-        res += '(archived)</span>';
+        res += '<%= I18n.t("atwho.res.archived") %></span>';
       } else {
         res += '</span>';
       }
@@ -308,8 +314,6 @@ var SmartAnnotation = (function() {
         case 'sam':
           res += '<span class="res-description">' + map.description + '</span>';
           break;
-        default:
-          break;
       }
 
       res += '</li>';
@@ -327,6 +331,7 @@ var SmartAnnotation = (function() {
               {query: query},
               function(data) {
                 callback(data.users);
+                initDismissButton();
               }
             );
           },
@@ -385,7 +390,7 @@ var SmartAnnotation = (function() {
         },
         headerTpl:
           '<div class="atwho-header-res">' +
-          '<div class="title"><%= I18n.t("atwho.users.title") %></div>' +
+          '<div class="title title-user"><%= I18n.t("atwho.users.title") %></div>' +
           '<div class="help">' +
           '<div>' +
           '<strong><%= I18n.t("atwho.users.navigate_1") %></strong> ' +
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 23b3f2c3f..5d79cbf21 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1794,6 +1794,10 @@ th.custom-field .modal-tooltiptext {
     }
   }
 
+  .title-user {
+    padding-top: 4px;
+  }
+
   .help {
     float: right;
     padding-top: 4px;
@@ -1857,3 +1861,17 @@ th.custom-field .modal-tooltiptext {
     font-size: 10px;
   }
 }
+
+.sa-type {
+  border: 1px solid $color-black;
+  border-radius: 4px;
+  color: $color-black;
+  font-weight: 600;
+  padding: 0 2px;
+  text-decoration: none;
+  text-transform: capitalize;
+
+  &:hover {
+    text-decoration: none;
+  }
+}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d0817ba4a..5021b9fb1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -59,19 +59,55 @@ module ApplicationHelper
       match = el.match(sa_reg)
       case match[2]
       when 'prj'
-        link_to match[1], project_path(match[3].to_i)
+        project = Project.find_by_id(match[3].to_i)
+        next unless project
+        if project.archived?
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to project.name,
+                     projects_archive_path} #{t'atwho.res.archived'}"
+        else
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to project.name,
+                     project_path(project)}"
+        end
       when 'exp'
-        link_to match[1], canvas_experiment_path(match[3].to_i)
+        experiment = Experiment.find_by_id(match[3].to_i)
+        next unless experiment
+        if experiment.archived?
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to experiment.name,
+                     experiment_archive_project_path(experiment.project)} " \
+          "#{t'atwho.res.archived'}"
+        else
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to experiment.name,
+                     canvas_experiment_path(experiment)}"
+        end
       when 'tsk'
-        link_to match[1], protocols_my_module_path(match[3].to_i)
+        my_module = MyModule.find_by_id(match[3].to_i)
+        next unless my_module
+        if my_module.archived?
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to my_module.name,
+                     module_archive_experiment_path(my_module.experiment)}" \
+          "#{t'atwho.res.archived'}"
+        else
+          "<span class='sa-type'>#{sanitize(match[2])}</span> " \
+          "#{link_to my_module.name,
+                     protocols_my_module_path(my_module)}"
+        end
       when 'sam'
         sample = Sample.find_by_id(match[3])
         if sample
-          link_to match[1],
-                  samples_project_path(sample
-                                       .organization
-                                       .projects
-                                       .first)
+          "<span class='glyphicon glyphicon-tint'></span> " \
+          "#{link_to sample.name,
+                     samples_project_path(sample
+                                          .organization
+                                          .projects
+                                          .first)}"
+        else
+          "<span class='glyphicon glyphicon-tint'></span> " \
+          "#{match[1]} #{t'atwho.res.deleted'}"
         end
       end
     end
diff --git a/app/views/my_module_comments/_comment.html.erb b/app/views/my_module_comments/_comment.html.erb
index 67c087dd5..e441746b1 100644
--- a/app/views/my_module_comments/_comment.html.erb
+++ b/app/views/my_module_comments/_comment.html.erb
@@ -39,7 +39,11 @@
 </div>
 <strong><%= comment.user.full_name %>:</strong>
 <div data-role="comment-message-container">
-  <p data-role="comment-message"><%= auto_link(simple_format(comment.message),
-                                               link: :urls,
-                                               html: { target: '_blank' }) %></p>
+  <p data-role="comment-message"><%= auto_link(
+    simple_format(
+      smart_annotation_parser(comment.message)
+    ),
+    link: :urls,
+    html: { target: '_blank' }
+  ) %></p>
 </div>
diff --git a/app/views/projects/experiment_archive/_experiment.html.erb b/app/views/projects/experiment_archive/_experiment.html.erb
index 508bd1983..d0b25bedc 100644
--- a/app/views/projects/experiment_archive/_experiment.html.erb
+++ b/app/views/projects/experiment_archive/_experiment.html.erb
@@ -67,8 +67,13 @@
     </div>
     <div class="row">
       <div class="col-xs-12">
-          <%= experiment.description %>
-        </span>
+        <%= auto_link(
+          simple_format(
+            smart_annotation_parser(experiment.description)
+          ),
+          link: :urls,
+          html: { target: '_blank' }
+        ) %>
       </div>
     </div>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f26b0c85d..7e0ae6f73 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1460,7 +1460,9 @@ en:
       confirm_2: "to confirm"
       dismiss_1: "esc"
       dismiss_2: "to dismiss"
-
+    res:
+      archived: "(archived)"
+      deleted: "(deleted)"
   # This section contains general words that can be used in any parts of
   # application.