diff --git a/static/index.html b/static/index.html
index ffe1182..61e6243 100644
--- a/static/index.html
+++ b/static/index.html
@@ -141,7 +141,7 @@
     <!-- Reply Clip -->
     <div  id="reply_clip" class="clip-win reply-clip bg-white is-hidden">
         <span>sss</span>
-        <a onclick="$('#reply_clip > span').text(''); $('#reply_clip').addClass('hidden');" style="float: right; padding: 3px 6px;">
+        <a onclick="$('#reply_clip > span').text(''); $('#reply_clip').addClass('is-hidden');" style="float: right; padding: 3px 6px;">
             <img src="img/close.svg" alt="X" style="height: 1.8rem; width: auto; cursor: pointer;">
         </a>
     </div>
@@ -149,8 +149,8 @@
     <!-- Selected Clip -->
     <div id="selected_clip" class="clip-win selected-clip bg-white is-hidden">
         <div style="padding: 4px;">
-            <div onclick="copyMessagesToClipboard()" class="button outline primary">Copy</div>
-            <div onclick="prepareReply()" class="button outline primary">Reply</div>
+            <div onclick="Messages.copyMessagesToClipboard()" class="button outline primary">Copy</div>
+            <div onclick="Messages.prepareReply()" class="button outline primary">Reply</div>
             <a onclick="Messages.unselectAll()" style="float: right; padding: 6px 2px 6px 8px;">
                 <img src="img/close.svg" alt="X" style="height: 1.8rem; width: auto; cursor: pointer;">
             </a>
diff --git a/static/js/app.js b/static/js/app.js
index 7fd6ac5..944e1c8 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -109,7 +109,7 @@ let Messages = class {
         }
         elm.append($('<pre>').append(text));
         elm.click(function() {
-            selectMessage(this);
+            Messages.pick(this);
         });
         area.append(elm);
 
@@ -145,7 +145,7 @@ let Messages = class {
         el.removeClass('is-hidden');
         el.attr('msg', text);
         $('#reply_clip > span').text(text.substr(0, 15)+ '...');
-        unselectMessages();
+        Messages.unselectAll();
     }
     
     static copyMessagesToClipboard() {
@@ -154,7 +154,7 @@ let Messages = class {
         $temp.val(this.selectedMessageToText()).select();
         document.execCommand("copy");
         $temp.remove();
-        unselectMessages();
+        Messages.unselectAll();
     }
     
     static cleanMessage() {
@@ -310,10 +310,10 @@ socket.addEventListener('message', function (event) {
             break;
         case 'status':
             if(j.status == "typing") {
-                typing.push(j.kunjika);
+                typing.push(vayakti[j.kunjika]+"("+j.kunjika.substr(0,8)+")");
                 Messages.pushTypingStatus();
             } else if(j.status == "typing_end") {
-                const index = typing.indexOf(j.kunjika);
+                const index = typing.indexOf(vayakti[j.kunjika]+"("+j.kunjika.substr(0,8)+")");
                 if (index > -1) typing.splice(index, 1);
                 Messages.pushTypingStatus();
             }