diff --git a/dist/main.css b/dist/main.css
index f1d3cf9..9af1b65 100644
--- a/dist/main.css
+++ b/dist/main.css
@@ -42,7 +42,7 @@ messaging {
       messaging .messages > li .avatar {
         width: 35px;
         height: 35px;
-        background-color: green;
+        background-color: #eee;
         border-radius: 35px;
         position: absolute; }
       messaging .messages > li .message {
@@ -76,7 +76,7 @@ messaging {
       background-color: initial; }
 
 
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL25vZGVfbW9kdWxlcy9hcHBpcmlvLXdvcmstc3R5bGVzL25vZGVfbW9kdWxlcy9ub2RlLW5lYXQvbm9kZV9tb2R1bGVzL2JvdXJib24tbmVhdC9hcHAvYXNzZXRzL3N0eWxlc2hlZXRzL2dyaWQvX2JveC1zaXppbmcuc2NzcyIsInN0eWxlcy9tZXNzYWdpbmcuc2NzcyIsIi4uL25vZGVfbW9kdWxlcy9hcHBpcmlvLXdvcmstc3R5bGVzL25vZGVfbW9kdWxlcy9ub2RlLW5lYXQvbm9kZV9tb2R1bGVzL25vZGUtYm91cmJvbi9ub2RlX21vZHVsZXMvYm91cmJvbi9hcHAvYXNzZXRzL3N0eWxlc2hlZXRzL2FkZG9ucy9fY2xlYXJmaXguc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQTtFQUNJLEFBQVk7O0FBSWhCLEFBQUcsQUFBQyxBQUFTLEFBQUM7RUFHUixBQUFZOztBQ1JsQixBQUFTLEFBQVE7RUFDYixBQUFZO0FBR2hCLEFBQVMsQUFBUTtFQUNiLEFBQVk7RUFFaEIsQUFBUyxBQUFRLEFBQUs7SUFDaEIsQUFBa0I7SUFDbEIsQUFBa0I7RUFHeEIsQUFBUyxBQUFRLEFBQUssQUFBTTtJQUN0QixBQUFTO0VBR2YsQUFBUyxBQUFRLEFBQUssQUFBTTtJQUN0QixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjs7QUFLeEI7RUFDRSxBQUFTO0VDWFgsQUFBUztJQUNMLEFBQU87SUFDUCxBQUFTO0lBQ1QsQUFBUztFRFliLEFBQVU7SUFDTixBQUFrQjtJQUNsQixBQUFrQjtJQUd0QixBQUFVLEFBQVk7TUFDaEIsQUFBWTtNQUNaLEFBQVk7TUFDWixBQUFZO01DdkJsQixBQUFVLEFBQVksQUFBRTtRQUNwQixBQUFPO1FBQ1AsQUFBUztRQUNULEFBQVM7TUR3QmIsQUFBVSxBQUFZLEFBQUU7UUFDaEIsQUFBWTtNQUdwQixBQUFVLEFBQVksQUFBRztRQWJILEFBY2Q7UUFkYyxBQWVkO1FBQ0EsQUFBa0I7UUFoQkosQUFpQmQ7UUFDQSxBQUFrQjtNQUcxQixBQUFVLEFBQVksQUFBRztRQUNqQixBQUFhO1FBQ2IsQUFBYTtRQXZCQyxBQXdCZDtRQUdSLEFBQVUsQUFBWSxBQUFHLEFBQVMsQUFBYTtVQUNuQyxBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUU5QixBQUFVLEFBQVksQUFBRyxBQUFTLEFBQWEsQUFBRTtZQUNuQyxBQUFhO0VBUzNCLEFBQVU7SUFDTixBQUFZO0lBRWhCLEFBQVUsQUFBSztNQUNULEFBQVM7TUFDVCxBQUFTO01BQ1QsQUFBUztNQUNULEFBQVM7SUFHZixBQUFVLEFBQUssQUFBUSxBQUFVLEFBQUs7TUFDaEMsQUFBWTtJQUdsQixBQUFVLEFBQUssQUFBTTtNQUNmLEFBQWtCO01BQ2xCLEFBQWtCO01BQ2xCLEFBQWtCO01BQ2xCLEFBQWtCO0lBR3hCLEFBQVUsQUFBSyxBQUFNO01BQ2YsQUFBa0I7TUFDbEIsQUFBa0IiLCJmaWxlIjoic3R5bGVzL21lc3NhZ2luZy5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyJAY2hhcnNldCBcIlVURi04XCI7XG5cbkBpZiAkYm9yZGVyLWJveC1zaXppbmcgPT0gdHJ1ZSB7XG4gIGh0bWwgeyAvLyBodHRwOi8vYml0Lmx5LzFxazJ0VlJcbiAgICBib3gtc2l6aW5nOiBib3JkZXItYm94O1xuICB9XG5cbiAgKiB7XG4gICAgJixcbiAgICAmOjphZnRlcixcbiAgICAmOjpiZWZvcmUge1xuICAgICAgYm94LXNpemluZzogaW5oZXJpdDtcbiAgICB9XG4gIH1cbn1cbiIsIkBpbXBvcnQgXCJ3b3JrLWluY2x1ZGVzXCI7XG5cbm1lc3NhZ2luZy53aWRnZXQge1xuICAubWVzc2FnZXMge1xuICAgIG1heC1oZWlnaHQ6IDEyMHB4O1xuICB9XG5cbiAgZm9ybSB7XG4gICAgbWFyZ2luLXRvcDogMTBweDtcblxuICAgIHRleHRhcmVhIHtcbiAgICAgIGhlaWdodCAgICAgICAgICA6IDMwcHg7XG4gICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjRTZFMUUxO1xuICAgIH1cblxuICAgIGJ1dHRvbi5hdHRhY2gge1xuICAgICAgZGlzcGxheTogbm9uZTtcbiAgICB9XG5cbiAgICBidXR0b24uZW50ZXIge1xuICAgICAgZmxvYXQgICAgICAgICAgIDogbGVmdDtcbiAgICAgIHdpZHRoICAgICAgICAgICA6IDEwMHB4O1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTtcbiAgICAgIGNvbG9yICAgICAgICAgICA6IHdoaXRlO1xuICAgICAgbWFyZ2luLXRvcCAgICAgIDogMTBweDtcbiAgICB9XG4gIH1cbn1cblxubWVzc2FnaW5nIHtcbiAgZGlzcGxheTogYmxvY2s7XG5cbiAgQGluY2x1ZGUgY2xlYXJmaXg7XG5cbiAgLm1lc3NhZ2VzIHtcbiAgICBtYXgtaGVpZ2h0ICAgICAgOiA1MDBweDtcbiAgICBvdmVyZmxvdyAgICAgICAgOiBzY3JvbGw7XG4gICAgJGF2YXRhci1kaWFtZXRlcjogMzVweDtcblxuICAgID4gbGkge1xuICAgICAgcG9zaXRpb24gIDogcmVsYXRpdmU7XG4gICAgICBwYWRkaW5nICAgOiAxMHB4IDA7XG4gICAgICBib3JkZXItdG9wOiAxcHggc29saWQgI2NjYztcblxuICAgICAgQGluY2x1ZGUgY2xlYXJmaXg7XG5cbiAgICAgICY6Zmlyc3QtY2hpbGQge1xuICAgICAgICBib3JkZXItdG9wOiAwO1xuICAgICAgfVxuXG4gICAgICAuYXZhdGFyIHtcbiAgICAgICAgd2lkdGggICAgICAgICAgIDogJGF2YXRhci1kaWFtZXRlcjtcbiAgICAgICAgaGVpZ2h0ICAgICAgICAgIDogJGF2YXRhci1kaWFtZXRlcjtcbiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47XG4gICAgICAgIGJvcmRlci1yYWRpdXMgICA6ICRhdmF0YXItZGlhbWV0ZXI7XG4gICAgICAgIHBvc2l0aW9uICAgICAgICA6IGFic29sdXRlO1xuICAgICAgfVxuXG4gICAgICAubWVzc2FnZSB7XG4gICAgICAgIGZsb2F0ICAgICAgOiBsZWZ0O1xuICAgICAgICBtYXJnaW4tbGVmdDogJGF2YXRhci1kaWFtZXRlciArIDIwcHg7XG4gICAgICAgIG1pbi1oZWlnaHQgOiAkYXZhdGFyLWRpYW1ldGVyO1xuXG4gICAgICAgIC5hdHRhY2htZW50cyB7XG4gICAgICAgICAgbGkge1xuICAgICAgICAgICAgd2lkdGggICAgICAgICAgIDogNTBweDtcbiAgICAgICAgICAgIGhlaWdodCAgICAgICAgICA6IDQwcHg7XG4gICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBwdXJwbGU7XG4gICAgICAgICAgICBkaXNwbGF5ICAgICAgICAgOiBpbmxpbmUtYmxvY2s7XG4gICAgICAgICAgICBtYXJnaW4gICAgICAgICAgOiA1cHg7XG5cbiAgICAgICAgICAgICY6Zmlyc3QtY2hpbGQge1xuICAgICAgICAgICAgICBtYXJnaW4tbGVmdDogMDtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgIH1cblxuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGZvcm0ge1xuICAgIG1hcmdpbi10b3A6IDIwcHg7XG5cbiAgICB0ZXh0YXJlYSB7XG4gICAgICB3aWR0aCAgOiAxMDAlO1xuICAgICAgcGFkZGluZzogNXB4O1xuICAgICAgaGVpZ2h0IDogNzVweDtcbiAgICAgIGJvcmRlciA6IDA7XG4gICAgfVxuXG4gICAgLmVudGVyLCAuYXR0YWNoIHtcbiAgICAgIG1hcmdpbi10b3A6IDIwcHg7XG4gICAgfVxuXG4gICAgYnV0dG9uLmVudGVyIHtcbiAgICAgIGZsb2F0ICAgICAgICAgICA6IGxlZnQ7XG4gICAgICB3aWR0aCAgICAgICAgICAgOiAyMDBweDtcbiAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZXk7XG4gICAgICBjb2xvciAgICAgICAgICAgOiB3aGl0ZVxuICAgIH1cblxuICAgIGJ1dHRvbi5hdHRhY2gge1xuICAgICAgZmxvYXQgICAgICAgICAgIDogcmlnaHQ7XG4gICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBpbml0aWFsO1xuICAgIH1cbiAgfVxufVxuIiwiQGNoYXJzZXQgXCJVVEYtOFwiO1xuXG4vLy8gUHJvdmlkZXMgYW4gZWFzeSB3YXkgdG8gaW5jbHVkZSBhIGNsZWFyZml4IGZvciBjb250YWluaW5nIGZsb2F0cy5cbi8vL1xuLy8vIEBsaW5rIGh0dHA6Ly9jc3Ntb2pvLmNvbS9sYXRlc3RfbmV3X2NsZWFyZml4X3NvX2Zhci9cbi8vL1xuLy8vIEBleGFtcGxlIHNjc3MgLSBVc2FnZVxuLy8vICAgLmVsZW1lbnQge1xuLy8vICAgICBAaW5jbHVkZSBjbGVhcmZpeDtcbi8vLyAgIH1cbi8vL1xuLy8vIEBleGFtcGxlIGNzcyAtIENTUyBPdXRwdXRcbi8vLyAgIC5lbGVtZW50OjphZnRlciB7XG4vLy8gICAgIGNsZWFyOiBib3RoO1xuLy8vICAgICBjb250ZW50OiBcIlwiO1xuLy8vICAgICBkaXNwbGF5OiB0YWJsZTtcbi8vLyAgIH1cblxuQG1peGluIGNsZWFyZml4IHtcbiAgJjo6YWZ0ZXIge1xuICAgIGNsZWFyOiBib3RoO1xuICAgIGNvbnRlbnQ6IFwiXCI7XG4gICAgZGlzcGxheTogdGFibGU7XG4gIH1cbn1cbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ== */
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL25vZGVfbW9kdWxlcy9hcHBpcmlvLXdvcmstc3R5bGVzL25vZGVfbW9kdWxlcy9ub2RlLW5lYXQvbm9kZV9tb2R1bGVzL2JvdXJib24tbmVhdC9hcHAvYXNzZXRzL3N0eWxlc2hlZXRzL2dyaWQvX2JveC1zaXppbmcuc2NzcyIsInN0eWxlcy9tZXNzYWdpbmcuc2NzcyIsIi4uL25vZGVfbW9kdWxlcy9hcHBpcmlvLXdvcmstc3R5bGVzL25vZGVfbW9kdWxlcy9ub2RlLW5lYXQvbm9kZV9tb2R1bGVzL25vZGUtYm91cmJvbi9ub2RlX21vZHVsZXMvYm91cmJvbi9hcHAvYXNzZXRzL3N0eWxlc2hlZXRzL2FkZG9ucy9fY2xlYXJmaXguc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQTtFQUNJLEFBQVk7O0FBSWhCLEFBQUcsQUFBQyxBQUFTLEFBQUM7RUFHUixBQUFZOztBQ1JsQixBQUFTLEFBQVE7RUFDYixBQUFZO0FBR2hCLEFBQVMsQUFBUTtFQUNiLEFBQVk7RUFFaEIsQUFBUyxBQUFRLEFBQUs7SUFDaEIsQUFBa0I7SUFDbEIsQUFBa0I7RUFHeEIsQUFBUyxBQUFRLEFBQUssQUFBTTtJQUN0QixBQUFTO0VBR2YsQUFBUyxBQUFRLEFBQUssQUFBTTtJQUN0QixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjtJQUNsQixBQUFrQjs7QUFLeEI7RUFDRSxBQUFTO0VDWFgsQUFBUztJQUNMLEFBQU87SUFDUCxBQUFTO0lBQ1QsQUFBUztFRFliLEFBQVU7SUFDTixBQUFrQjtJQUNsQixBQUFrQjtJQUd0QixBQUFVLEFBQVk7TUFDaEIsQUFBWTtNQUNaLEFBQVk7TUFDWixBQUFZO01DdkJsQixBQUFVLEFBQVksQUFBRTtRQUNwQixBQUFPO1FBQ1AsQUFBUztRQUNULEFBQVM7TUR3QmIsQUFBVSxBQUFZLEFBQUU7UUFDaEIsQUFBWTtNQUdwQixBQUFVLEFBQVksQUFBRztRQWJILEFBY2Q7UUFkYyxBQWVkO1FBQ0EsQUFBa0I7UUFoQkosQUFpQmQ7UUFDQSxBQUFrQjtNQUcxQixBQUFVLEFBQVksQUFBRztRQUNqQixBQUFhO1FBQ2IsQUFBYTtRQXZCQyxBQXdCZDtRQUdSLEFBQVUsQUFBWSxBQUFHLEFBQVMsQUFBYTtVQUNuQyxBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUNsQixBQUFrQjtVQUU5QixBQUFVLEFBQVksQUFBRyxBQUFTLEFBQWEsQUFBRTtZQUNuQyxBQUFhO0VBUzNCLEFBQVU7SUFDTixBQUFZO0lBRWhCLEFBQVUsQUFBSztNQUNULEFBQVM7TUFDVCxBQUFTO01BQ1QsQUFBUztNQUNULEFBQVM7SUFHZixBQUFVLEFBQUssQUFBUSxBQUFVLEFBQUs7TUFDaEMsQUFBWTtJQUdsQixBQUFVLEFBQUssQUFBTTtNQUNmLEFBQWtCO01BQ2xCLEFBQWtCO01BQ2xCLEFBQWtCO01BQ2xCLEFBQWtCO0lBR3hCLEFBQVUsQUFBSyxBQUFNO01BQ2YsQUFBa0I7TUFDbEIsQUFBa0IiLCJmaWxlIjoic3R5bGVzL21lc3NhZ2luZy5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyJAY2hhcnNldCBcIlVURi04XCI7XG5cbkBpZiAkYm9yZGVyLWJveC1zaXppbmcgPT0gdHJ1ZSB7XG4gIGh0bWwgeyAvLyBodHRwOi8vYml0Lmx5LzFxazJ0VlJcbiAgICBib3gtc2l6aW5nOiBib3JkZXItYm94O1xuICB9XG5cbiAgKiB7XG4gICAgJixcbiAgICAmOjphZnRlcixcbiAgICAmOjpiZWZvcmUge1xuICAgICAgYm94LXNpemluZzogaW5oZXJpdDtcbiAgICB9XG4gIH1cbn1cbiIsIkBpbXBvcnQgXCJ3b3JrLWluY2x1ZGVzXCI7XG5cbm1lc3NhZ2luZy53aWRnZXQge1xuICAubWVzc2FnZXMge1xuICAgIG1heC1oZWlnaHQ6IDEyMHB4O1xuICB9XG5cbiAgZm9ybSB7XG4gICAgbWFyZ2luLXRvcDogMTBweDtcblxuICAgIHRleHRhcmVhIHtcbiAgICAgIGhlaWdodCAgICAgICAgICA6IDMwcHg7XG4gICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjRTZFMUUxO1xuICAgIH1cblxuICAgIGJ1dHRvbi5hdHRhY2gge1xuICAgICAgZGlzcGxheTogbm9uZTtcbiAgICB9XG5cbiAgICBidXR0b24uZW50ZXIge1xuICAgICAgZmxvYXQgICAgICAgICAgIDogbGVmdDtcbiAgICAgIHdpZHRoICAgICAgICAgICA6IDEwMHB4O1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTtcbiAgICAgIGNvbG9yICAgICAgICAgICA6IHdoaXRlO1xuICAgICAgbWFyZ2luLXRvcCAgICAgIDogMTBweDtcbiAgICB9XG4gIH1cbn1cblxubWVzc2FnaW5nIHtcbiAgZGlzcGxheTogYmxvY2s7XG5cbiAgQGluY2x1ZGUgY2xlYXJmaXg7XG5cbiAgLm1lc3NhZ2VzIHtcbiAgICBtYXgtaGVpZ2h0ICAgICAgOiA1MDBweDtcbiAgICBvdmVyZmxvdyAgICAgICAgOiBzY3JvbGw7XG4gICAgJGF2YXRhci1kaWFtZXRlcjogMzVweDtcblxuICAgID4gbGkge1xuICAgICAgcG9zaXRpb24gIDogcmVsYXRpdmU7XG4gICAgICBwYWRkaW5nICAgOiAxMHB4IDA7XG4gICAgICBib3JkZXItdG9wOiAxcHggc29saWQgI2NjYztcblxuICAgICAgQGluY2x1ZGUgY2xlYXJmaXg7XG5cbiAgICAgICY6Zmlyc3QtY2hpbGQge1xuICAgICAgICBib3JkZXItdG9wOiAwO1xuICAgICAgfVxuXG4gICAgICAuYXZhdGFyIHtcbiAgICAgICAgd2lkdGggICAgICAgICAgIDogJGF2YXRhci1kaWFtZXRlcjtcbiAgICAgICAgaGVpZ2h0ICAgICAgICAgIDogJGF2YXRhci1kaWFtZXRlcjtcbiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2VlZTtcbiAgICAgICAgYm9yZGVyLXJhZGl1cyAgIDogJGF2YXRhci1kaWFtZXRlcjtcbiAgICAgICAgcG9zaXRpb24gICAgICAgIDogYWJzb2x1dGU7XG4gICAgICB9XG5cbiAgICAgIC5tZXNzYWdlIHtcbiAgICAgICAgZmxvYXQgICAgICA6IGxlZnQ7XG4gICAgICAgIG1hcmdpbi1sZWZ0OiAkYXZhdGFyLWRpYW1ldGVyICsgMjBweDtcbiAgICAgICAgbWluLWhlaWdodCA6ICRhdmF0YXItZGlhbWV0ZXI7XG5cbiAgICAgICAgLmF0dGFjaG1lbnRzIHtcbiAgICAgICAgICBsaSB7XG4gICAgICAgICAgICB3aWR0aCAgICAgICAgICAgOiA1MHB4O1xuICAgICAgICAgICAgaGVpZ2h0ICAgICAgICAgIDogNDBweDtcbiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHB1cnBsZTtcbiAgICAgICAgICAgIGRpc3BsYXkgICAgICAgICA6IGlubGluZS1ibG9jaztcbiAgICAgICAgICAgIG1hcmdpbiAgICAgICAgICA6IDVweDtcblxuICAgICAgICAgICAgJjpmaXJzdC1jaGlsZCB7XG4gICAgICAgICAgICAgIG1hcmdpbi1sZWZ0OiAwO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgZm9ybSB7XG4gICAgbWFyZ2luLXRvcDogMjBweDtcblxuICAgIHRleHRhcmVhIHtcbiAgICAgIHdpZHRoICA6IDEwMCU7XG4gICAgICBwYWRkaW5nOiA1cHg7XG4gICAgICBoZWlnaHQgOiA3NXB4O1xuICAgICAgYm9yZGVyIDogMDtcbiAgICB9XG5cbiAgICAuZW50ZXIsIC5hdHRhY2gge1xuICAgICAgbWFyZ2luLXRvcDogMjBweDtcbiAgICB9XG5cbiAgICBidXR0b24uZW50ZXIge1xuICAgICAgZmxvYXQgICAgICAgICAgIDogbGVmdDtcbiAgICAgIHdpZHRoICAgICAgICAgICA6IDIwMHB4O1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JleTtcbiAgICAgIGNvbG9yICAgICAgICAgICA6IHdoaXRlXG4gICAgfVxuXG4gICAgYnV0dG9uLmF0dGFjaCB7XG4gICAgICBmbG9hdCAgICAgICAgICAgOiByaWdodDtcbiAgICAgIGJhY2tncm91bmQtY29sb3I6IGluaXRpYWw7XG4gICAgfVxuICB9XG59XG4iLCJAY2hhcnNldCBcIlVURi04XCI7XG5cbi8vLyBQcm92aWRlcyBhbiBlYXN5IHdheSB0byBpbmNsdWRlIGEgY2xlYXJmaXggZm9yIGNvbnRhaW5pbmcgZmxvYXRzLlxuLy8vXG4vLy8gQGxpbmsgaHR0cDovL2Nzc21vam8uY29tL2xhdGVzdF9uZXdfY2xlYXJmaXhfc29fZmFyL1xuLy8vXG4vLy8gQGV4YW1wbGUgc2NzcyAtIFVzYWdlXG4vLy8gICAuZWxlbWVudCB7XG4vLy8gICAgIEBpbmNsdWRlIGNsZWFyZml4O1xuLy8vICAgfVxuLy8vXG4vLy8gQGV4YW1wbGUgY3NzIC0gQ1NTIE91dHB1dFxuLy8vICAgLmVsZW1lbnQ6OmFmdGVyIHtcbi8vLyAgICAgY2xlYXI6IGJvdGg7XG4vLy8gICAgIGNvbnRlbnQ6IFwiXCI7XG4vLy8gICAgIGRpc3BsYXk6IHRhYmxlO1xuLy8vICAgfVxuXG5AbWl4aW4gY2xlYXJmaXgge1xuICAmOjphZnRlciB7XG4gICAgY2xlYXI6IGJvdGg7XG4gICAgY29udGVudDogXCJcIjtcbiAgICBkaXNwbGF5OiB0YWJsZTtcbiAgfVxufVxuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9 */
 html {
   box-sizing: border-box; }
 
diff --git a/dist/main.js b/dist/main.js
index 5efa06a..af3f555 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -10,7 +10,7 @@
 
 angular.module("appirio-tech-messaging").run(["$templateCache", function($templateCache) {$templateCache.put("views/messaging.html","<messaging thread-id=\"123\"></messaging>");
 $templateCache.put("views/messaging.directive.html","<ul class=\"messages\"><li ng-repeat=\"message in vm.messaging.messages track by $index\"><img ng-src=\"{{ vm.messaging.avatars[message.publisherId] }}\" class=\"avatar\"/><div class=\"message\"><p>{{ message.body }}</p><ul class=\"attachments\"><li ng-repeat=\"attachment in message.attachments track by $index\"><a href=\"#\">{{ message.attachments.originalUrl }}</a></li></ul><time>{{ message.createdAt | timeLapse }}</time></div></li><a id=\"messaging-bottom-{{ vm.threadId }}\"></a></ul><form ng-submit=\"vm.sendMessage()\"><textarea placeholder=\"Send a message&hellip;\" ng-model=\"vm.newMessage\"></textarea><button type=\"submit\" class=\"enter\">Enter</button><button type=\"button\" class=\"attach\"><div class=\"icon\"></div><span>Add Attachment</span></button></form>");
-$templateCache.put("views/threads.directive.html","<ul><li ng-repeat=\"thread in vm.threads track by $index\"><a ui-sref=\"messaging({id: 123})\"><header><h4>{{ thread.subject }}</h4><time>{{ thread.messages[0].createdAt }}</time></header><main><img ng-src=\"{{ vm.avatars[thread.messages[0].publisherId] }}\" class=\"avatar\"/><div class=\"notification\">{{ thread.unreadCount }}</div><div class=\"message\"><div class=\"co-pilot\">{{ thread.messages[0].publisherId }}:</div><p>{{ thread.messages[0].body }}</p></div></main></a></li></ul>");}]);
+$templateCache.put("views/threads.directive.html","<ul><li ng-repeat=\"thread in vm.threads track by $index\"><a ui-sref=\"messaging({ id: thread.id })\"><header><h4>{{ thread.subject }}</h4><time>{{ thread.messages[0].createdAt }}</time></header><main><img ng-src=\"{{ vm.avatars[thread.messages[0].publisherId] }}\" class=\"avatar\"/><div class=\"notification\">{{ thread.unreadCount }}</div><div class=\"message\"><div class=\"co-pilot\">{{ thread.messages[0].publisherId }}:</div><p>{{ thread.messages[0].body }}</p></div></main></a></li></ul>");}]);
 (function() {
   'use strict';
   var MessagingController;
@@ -26,7 +26,9 @@ $templateCache.put("views/threads.directive.html","<ul><li ng-repeat=\"thread in
         messages: []
       };
       vm.newMessage = '';
-      getUserMessages();
+      $scope.$watch('threadId', function() {
+        return getUserMessages();
+      });
       vm.sendMessage = sendMessage;
       return vm;
     };
@@ -275,20 +277,24 @@ $templateCache.put("views/threads.directive.html","<ul><li ng-repeat=\"thread in
   var ThreadsController;
 
   ThreadsController = function($scope, ThreadsService) {
-    var activate, onChange, vm;
+    var activate, getThread, onChange, vm;
     vm = this;
     onChange = function(threadsVm) {
       vm.threads = threadsVm.threads;
       vm.totalUnreadCount = threadsVm.totalUnreadCount;
       return vm.avatars = threadsVm.avatars;
     };
-    activate = function() {
+    getThread = function() {
       var threadParams;
       threadParams = {
-        subscriber: $scope.subscriber,
-        threadId: $scope.threadId
+        subscriber: $scope.subscriber
       };
-      ThreadsService.get(threadParams, onChange);
+      return ThreadsService.get(threadParams, onChange);
+    };
+    activate = function() {
+      $scope.$watch('subscriber', function() {
+        return getThread();
+      });
       return vm;
     };
     return activate();