diff --git a/chatto/src/main/javascript/ts/src/view/ChatView.ts b/chatto/src/main/javascript/ts/src/view/ChatView.ts
index 0ee83d4..24b0bce 100644
--- a/chatto/src/main/javascript/ts/src/view/ChatView.ts
+++ b/chatto/src/main/javascript/ts/src/view/ChatView.ts
@@ -12,12 +12,10 @@ import { SJCLEncryptionService } from "../service/SJCLEncryptionService";
 import { EncryptionService } from "../service/EncryptionService";
 import { ChatMessageDTO } from "../dto/ChatMessageDTO";
 import { fetchHandler } from "./FetchHandler";
-// var md = new markdownit();
 
 export class ChatView implements Observer {
     private readonly _chatModel: ChatModel;
     private readonly _messageContainer: HTMLElement;
-    // private readonly _messageSendButton: HTMLElement;
     private readonly _messageSendTemplate = TemplateFactory.getTemplate('msg_container_send_template');
     private readonly _messageReceiveTemplate = TemplateFactory.getTemplate('msg_container_template');
     private readonly _markdownService: MarkDownService = new MarkDownItMarkDownService();
@@ -27,7 +25,6 @@ export class ChatView implements Observer {
     constructor(chatModel: ChatModel, messageContainer: HTMLElement) {
         this._messageContainer = messageContainer;
         this._chatModel = chatModel;
-        // this._messageSendButton = messageSendButton;
         this.addEventListeners();
     }
 
diff --git a/chatto/src/main/javascript/ts/src/view/UserView.ts b/chatto/src/main/javascript/ts/src/view/UserView.ts
index ab2e411..15dec8e 100644
--- a/chatto/src/main/javascript/ts/src/view/UserView.ts
+++ b/chatto/src/main/javascript/ts/src/view/UserView.ts
@@ -20,8 +20,8 @@ export class UserView implements Observer {
     private readonly _userSearchButton: HTMLElement;
     private readonly _userSearchCancelButton: HTMLElement;
     private readonly _searchService: SearchService<ActiveUserViewModel>;
-    // private userBoxes: any[] =  [];
-
+    private readonly _userContactOnlineTemplate: Handlebars.TemplateDelegate<ActiveUserViewModel> = TemplateFactory.getTemplate('user-contact-online-template');
+    private readonly _userContactOfflineTemplate: Handlebars.TemplateDelegate<ActiveUserViewModel> = TemplateFactory.getTemplate('user-contact-offline-template');
 
     constructor(model: UserModel, chatModel: ChatModel, usersListElement: HTMLElement,
         userSearchInputElement: HTMLInputElement, userSearchButton: HTMLElement, userSearchCancelButton: HTMLElement) {
@@ -36,15 +36,11 @@ export class UserView implements Observer {
         this.addSearchEventListeners();
     }
 
-
-
     update(data: ActiveUserViewModel[]): void {
-        let template = TemplateFactory.getTemplate('user-contact-online-template');
         let html: string = "";
         data.forEach((element: ActiveUserViewModel) => {
-            html += template(element);
+            element.online ? html+=this._userContactOnlineTemplate(element) : html+=this._userContactOfflineTemplate(element);
         });
-        // this._element.innerHTML = html;
         $(this._usersListElement).html(DOMPurify.sanitize(html));
         this.addUserCallBacks();
         console.log(this._usersListElement.innerHTML);