Merge with current master

website/styles/chat.css

@@ -1,14 +1,22 @@
 .chat {
     text-align: center;
+    padding-top: 15px;
 }
 
 .chat-history {
     /*border: solid #845663;*/
     width: 80%;
     height: 500px;
-    margin: 20px auto;
+    margin: auto auto;
     background-color: white;
     vertical-align: bottom;
+    overflow-y: scroll;
+    padding: 5px 0;
+    border-radius: 10px;
+}
+
+.chat-field {
+    padding: 15px;
 }
 
 .chat-field input {
@@ -22,31 +30,34 @@
 
 .chat-field input[type="submit"] {
     width: 60px;
-
+    background-color: #845663;
+    color: white;
+    padding: 5px;
 }
+
 .chat-message {
     width: 100%;
-    height: 40px;
+    min-height: 40px;
     padding-top: 10px;
+    clear: both;
 }
 
 .chat-message-self, .chat-message-other {
+    text-align: left;
     border-radius: 20px;
     padding: 10px 12px;
-    min-width: 10%;
     max-width: 45%;
 }
 
 .chat-message-self {
-    text-align: right;
     float: right;
+
     margin-right: 10px;
     background-color: darkgreen;
     color: white;
 }
 
 .chat-message-other {
-    text-align: left;
     float: left;
     margin-left: 10px;
     background-color: aquamarine;