diff --git a/MessageSystem/chat.css b/MessageSystem/chat.css
index 55ada76c3ac4a4dc54e7fc977e922968e7fc1c52..897be9bbb13792753f8607e4b69f9d4c1c685706 100755
--- a/MessageSystem/chat.css
+++ b/MessageSystem/chat.css
@@ -8,9 +8,10 @@ body {
     margin: 25px;
     width: 500px;
     height: 600px;
+    /*height: 200px;*/
     border: 1px solid black;
     font-family: Helvetica;
-    position: relative;
+    /*position: relative;*/
 }
 
 .chat-title {
@@ -27,7 +28,14 @@ body {
 .chat-box {
     background: rgb(243, 248, 255);
     height:452px;
-    padding-bottom: 50px;
+    /*padding-bottom: 50px;*/
+    /* height: auto; */
+    overflow: auto;
+}
+.chat-list {
+    background: rgb(243, 248, 255);
+    height:505px;
+    /*padding-bottom: 50px;*/
     /* height: auto; */
     overflow: auto;
 }
diff --git a/MessageSystem/chatlist.php b/MessageSystem/chatlist.php
index 19ffeeb0f71fb2137aa07bdc9f512acd6c097606..ad14324cff62f160ec4a6b0e9d7397f755c6dab6 100644
--- a/MessageSystem/chatlist.php
+++ b/MessageSystem/chatlist.php
@@ -31,8 +31,22 @@
         firebase.database().ref().on('child_added', function(snapshot) {
             var chatrooms = snapshot.val();
             
-            if (chatrooms.sender=="person1"){
-            	console.log("yeay");
+            if ((chatrooms.sender=="person1")||(chatrooms.receiver=="person1")){
+            	// console.log("yeay");
+            	var chatlist = document.getElementById("chatlist");
+            	//Kalo usernamenya sama, hapus yang sebelumnya
+            	for (i = 0; i < chatlist.childElementCount; i++) { 
+				   	var username = chatlist.childNodes[i].childNodes[0].childNodes[0].innerText;
+				   	// console.log(i+username+"sekarang");
+				   	// console.log(i+chatrooms.receiver);
+				   	// console.log(i+chatrooms.sender);
+				   	// console.log(i+chatrooms.message);
+				   	if ((username==chatrooms.sender)||(username==chatrooms.receiver)){
+						// console.log("sama"+username);
+						chatlist.removeChild(chatlist.childNodes[i]);       
+				   	}
+				}
+
 	            var chatroom_item = document.createElement("div");
 	            chatroom_item.classList.add('chatroom-item');
 
@@ -42,8 +56,13 @@
 	            var chatroom_lastmessage = document.createElement("div");
 	            chatroom_lastmessage.classList.add('chatroom-lastmessage');
 
-	            var chatroom_username_span = document.createElement("span");
-	            chatroom_username_span.textContent = chatrooms.receiver;
+	            var chatroom_username_span = document.createElement("span"); 
+            	if (chatrooms.sender=="person1") {
+            		chatroom_username_span.textContent = chatrooms.receiver;
+            	} else {
+            		chatroom_username_span.textContent = chatrooms.sender;
+            	}
+	            
 	            chatroom_username.appendChild(chatroom_username_span);
 	            var chatroom_lastmessage_span = document.createElement("span");
 	            chatroom_lastmessage_span.textContent = chatrooms.message;
@@ -51,9 +70,9 @@
 
 	            chatroom_item.appendChild(chatroom_username);
 				chatroom_item.appendChild(chatroom_lastmessage);
-	            var chatlist = document.getElementById("chatlist");
+	            
 	           
-            	chatlist.appendChild(chatroom_item);
+            	chatlist.insertBefore(chatroom_item, chatlist.childNodes[0]);
             } 
         });
     }
diff --git a/MessageSystem/chatroom.php b/MessageSystem/chatroom.php
index 8c42204740b960c5340a0954b98b05e71b8e2158..2a1f9cb6ec3224ca9937412c359327be3d4be1f3 100755
--- a/MessageSystem/chatroom.php
+++ b/MessageSystem/chatroom.php
@@ -74,20 +74,22 @@
   var startListening = function() {
         firebase.database().ref().on('child_added', function(snapshot) {
             var msg = snapshot.val();
-            
-            var msgTextElement = document.createElement("p");
-            msgTextElement.textContent = msg.message;
+            if (((msg.sender=="person1")&&(msg.receiver=="person2"))||((msg.sender=="person2")&&(msg.receiver=="person1"))) {
+                var msgTextElement = document.createElement("p");
+                msgTextElement.textContent = msg.message;
     
-            if ((msg.sender=="person1")&&(msg.receiver=="person2")){
-                msgTextElement.classList.add('sendermessage');
-            } else if ((msg.sender=="person2")&&(msg.receiver=="person1")) {
-                msgTextElement.classList.add('receivemessage');
-            } else {
-                
+                if (msg.sender=="person1"){
+                    msgTextElement.classList.add('sendermessage');
+                } else if (msg.sender=="person2") {
+                    msgTextElement.classList.add('receivemessage');
+                } else {
+                    
+                }
+                var chatbox = document.getElementById("chatbox");
+                chatbox.appendChild(msgTextElement);
+                chatbox.scrollTop=chatbox.scrollHeight;
             }
-            var chatbox = document.getElementById("chatbox");
-            chatbox.appendChild(msgTextElement);
-            chatbox.scrollTop=chatbox.scrollHeight;
+            
         });
     }
     startListening();