diff --git a/mattermost.el b/mattermost.el
index ffb049b..214fb95 100644
--- a/mattermost.el
+++ b/mattermost.el
@@ -116,7 +116,12 @@ conform to a post plist"
          (post (mattermost--ws-posted-to-post msg))
          (channel-id (plist-get post :channel_id))
          (chanb (plist-get mattermost-buffers (mattermost-string->keyword channel-id))))
+    ;; ToDo: check if buffer not deleted or better, hook into kill
+    ;; buffer hook on mattermost-channel-mode and remove buffer from
+    ;; mattermost-buffers variable so it's not found
     (if (not (null chanb))
+        ;; If chanb not current buffer, add a notification, maybe both
+        ;; in the modeline and in a buffer chan -> notif
         (with-current-buffer chanb
           (save-excursion
             (goto-char mattermost-insert-marker)
@@ -189,6 +194,7 @@ conform to a post plist"
 
 (define-button-type 'mattermost-channel
   'face 'default
+  'mouse-face 'nil
   'read-only t
   'rear-sticky t
   'front-sticky t
@@ -262,6 +268,7 @@ user to check their status and select between them")
 
 (define-button-type 'mattermost-username
   'face 'bold
+  'mouse-face 'nil
   'read-only t
   'rear-sticky t
   'front-sticky t
@@ -279,6 +286,7 @@ user to check their status and select between them")
 
 (define-button-type 'mattermost-post
   'face 'default
+  'mouse-face 'nil
   'read-only t
   'rear-sticky t
   'front-sticky t