diff --git a/api/event.php b/api/event.php
index 6176729..b9913a9 100644
--- a/api/event.php
+++ b/api/event.php
@@ -746,7 +746,7 @@
                     send_player_joined($clientMsg->name);
                     break;
                 case 'chat_send':
-                    send_chat_msg($socketUsers[$s], $clientMsg->msg);
+                    send_chat_msg($socketUsers[$s], $clientMsg->msg, $clientMsg->options);
                     break;
                 case 'turnend':
                     if($gi->gameover) break;
@@ -829,7 +829,7 @@
         ]
     ]);
 
-    send_chat_msg('', "$name ($team) revealed card $wordValue ($cardTeam)", true);
+    send_chat_msg('', "$name ($team) revealed card $wordValue ($cardTeam)", [], true);
 
     if(other_team($team, $word)) {
         send_turnend($team);
@@ -838,11 +838,12 @@
     update_stats($word, $team);
 }
 
-function send_chat_msg($name, $msg, $isSystem = false) {
+function send_chat_msg($name, $msg, $options = null, $isSystem = false) {
     send_message_smpl([
         'type' => 'chat_received',
         'data' => [
             'sender' => $name,
+            'team' => isset($options->team) ? $options->team : null,
             'isSystem' => $isSystem,
             'msg' => $msg,
             'time' => get_now()
@@ -857,7 +858,7 @@
             'winner' => $winner,
         ]
     ]);
-    send_chat_msg('', "Team $winner won the game! Congratulations!", true);
+    send_chat_msg('', "Team $winner won the game! Congratulations!", [], true);
 }
 
 function send_new_game($name) {
@@ -878,7 +879,7 @@
         ]
     ]);
 
-    send_chat_msg('', "New game started by $name. Good luck!", true);
+    send_chat_msg('', "New game started by $name. Good luck!", [], true);
 }
 
 function get_now() {
diff --git a/package-lock.json b/package-lock.json
index 9fbcf5d..0febca2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3630,6 +3630,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-1.0.0.tgz",
+      "integrity": "sha512-Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng=="
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -4426,6 +4431,11 @@
         "find-up": "^3.0.0"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
diff --git a/package.json b/package.json
index 706a613..28f1f58 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,8 @@
     "@joeattardi/emoji-button": "^3.0.1",
     "bootstrap": "^4.4.1",
     "jquery": "^3.5.0",
+    "marked": "^1.0.0",
+    "popper.js": "^1.16.1",
     "typeface-raleway": "0.0.75",
     "vue": "^2.6.11"
   }
diff --git a/src/js/codenames.js b/src/js/codenames.js
index 4ced985..c91c559 100644
--- a/src/js/codenames.js
+++ b/src/js/codenames.js
@@ -2,11 +2,11 @@
 import App from './components/App.vue';
 import {library} from '@fortawesome/fontawesome-svg-core';
 import {
-    faUserSecret
+    faLock,
 } from '@fortawesome/free-solid-svg-icons';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 
-library.add(faUserSecret);
+library.add(faLock);
 
 // SCSS loading
 import '../sass/codenames.scss';
@@ -14,6 +14,11 @@
 // Font loading
 require('typeface-raleway');
 
+// 3rd party libs
+require('popper.js');
+require('bootstrap');
+require('jquery');
+
 Vue.component('fa-icon', FontAwesomeIcon);
 
 Vue.config.productionTip = false;
diff --git a/src/js/components/App.vue b/src/js/components/App.vue
index 15e3805..1e9349b 100644
--- a/src/js/components/App.vue
+++ b/src/js/components/App.vue
@@ -1,79 +1,91 @@
 <template>
     <div class="row">
-        <div v-if="nameChosen && connected">
-            <div class="col-7 offset-1">
-                <div class="d-flex flex-row justify-content-between">
-                    <div>
-                        <span :class="getPlayerColor('red')">
-                            {{ openRedCards }}
-                        </span>
-                        -
-                        <span :class="getPlayerColor('blue')">
-                            {{ openBlueCards }}
-                        </span>
-                    </div>
-                    <div :class="getPlayerColor()">
-                        <h2 v-if="gameOver">
-                            {{ winner }} won!
-                        </h2>
-                        <span v-else>
-                            {{ teamName }}'s turn
-                        </span>
-                    </div>
-                </div>
-                <div class="card-deck m-3" v-for="r, i in size.rows">
-                    <div class="card py-3 border" v-for="c, j in size.cols" :data-id="`${i}, ${j}`" :class="getClasses(i, j)" @click="touchCard(i, j)">
-                        <div class="card-body text-center">
-                            {{ words[i*size.cols + j].value }}
-                            <div class="rounded-circle marker-icon" :class="getClasses(i, j, true)" v-show="isLeader && !wordRevealed(i, j)"></div>
+        <div v-if="nameChosen && connected" class="col-12">
+            <div class="row">
+                <div class="col-7 offset-1">
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <span :class="getPlayerColor('red')">
+                                {{ openRedCards }}
+                            </span>
+                            -
+                            <span :class="getPlayerColor('blue')">
+                                {{ openBlueCards }}
+                            </span>
                         </div>
-                    </div>
-                </div>
-                <div class="d-flex flex-row justify-content-between">
-                    <button type="button" class="btn btn-primary" @click="isLeader = !isLeader">
-                        Toggle Leadership
-                    </button>
-                    <button type="button" class="btn btn-primary" @click="startNewGame()" v-if="gameOver">
-                        Start new Game
-                    </button>
-                    <button type="button" class="btn btn-primary" @click="nextPlayer()" v-else>
-                        End {{ teamName }}'s turn
-                    </button>
-                </div>
-            </div>
-            <div class="col-3">
-                <span>Connected as {{ username }}</span>
-                <hr class="my-2">
-                <div class="custom-control custom-switch mb-2">
-                    <input type="checkbox" class="custom-control-input" id="system-message-switch" v-model="showSystemMessages">
-                    <label class="custom-control-label" for="system-message-switch">Show System Messages</label>
-                </div>
-                <div>
-                    <div v-for="msg in filteredChats" class="alert small px-2 py-1 mb-2" :class="getChatMessageClasses(msg)">
-                        <span class="small">
-                            <span v-if="msg.isSystem">
-                                System Message - {{ formatDate(msg.time) }}
-                            </span>
-                            <span v-else-if="msg.sender !== username">
-                                {{ msg.sender }} - {{ formatDate(msg.time) }}
-                            </span>
+                        <div :class="getPlayerColor()">
+                            <h2 v-if="gameOver">
+                                {{ winner }} won!
+                            </h2>
                             <span v-else>
-                                 {{ formatDate(msg.time) }} - You
+                                {{ teamName }}'s turn
                             </span>
-                        </span>
-                        <div v-html="msg.msg"></div>
-                    </div>
-                </div>
-                <hr class="my-2">
-                <form @submit.prevent="sendChatMessage()">
-                    <div class="input-group mb-3">
-                        <input type="text" class="form-control" id="chatmsg-composer" v-model="chatmsg" autocomplete="off" placeholder="Chat message..." aria-label="Compose chat message" aria-describedby="submit-chat-msg">
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" id="emoji-picker">😀</button>
-                            <button class="btn btn-outline-success" type="submit" id="submit-chat-msg">Send</button>
                         </div>
                     </div>
-                </form>
+                    <div class="card-deck m-3" v-for="r, i in size.rows">
+                        <div class="card py-3 border" v-for="c, j in size.cols" :data-id="`${i}, ${j}`" :class="getClasses(i, j)" @click="touchCard(i, j)">
+                            <div class="card-body text-center">
+                                {{ words[i*size.cols + j].value }}
+                                <div class="rounded-circle marker-icon" :class="getClasses(i, j, true)" v-show="isLeader && !wordRevealed(i, j)"></div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <button type="button" class="btn btn-primary" @click="isLeader = !isLeader">
+                            Toggle Leadership
+                        </button>
+                        <button type="button" class="btn btn-primary" @click="startNewGame()" v-if="gameOver">
+                            Start new Game
+                        </button>
+                        <button type="button" class="btn btn-primary" @click="nextPlayer()" v-else>
+                            End {{ teamName }}'s turn
+                        </button>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <span>Connected as {{ username }}</span>
+                    <hr class="my-2">
+                    <div class="custom-control custom-switch mb-2">
+                        <input type="checkbox" class="custom-control-input" id="system-message-switch" v-model="showSystemMessages">
+                        <label class="custom-control-label" for="system-message-switch">Show System Messages</label>
+                    </div>
+                    <div>
+                        <div v-for="msg in filteredChats" class="alert px-2 py-1 mb-2" :class="getChatMessageClasses(msg)">
+                            <span class="small">
+                                <span v-if="msg.team" class="mr-1">
+                                    <fa-icon icon="lock" data-toggle="tooltip" data-placement="bottom" :title="`Send to ${msg.team}`" />
+                                </span>
+                                <span v-if="msg.isSystem">
+                                    System Message - {{ formatDate(msg.time) }}
+                                </span>
+                                <span v-else-if="msg.sender !== username">
+                                    {{ msg.sender }} - {{ formatDate(msg.time) }}
+                                </span>
+                                <span v-else>
+                                    {{ formatDate(msg.time) }} - You
+                                </span>
+                            </span>
+                            <div class="chat-msg-content" v-html="formatMarkdown(msg.msg)"></div>
+                        </div>
+                    </div>
+                    <hr class="my-2">
+                    <form @submit.prevent="sendChatMessage()">
+                        <div class="input-group mb-3">
+                            <input type="text" class="form-control" id="chatmsg-composer" v-model="chatmsg" autocomplete="off" placeholder="Chat message..." aria-label="Compose chat message" aria-describedby="submit-chat-msg">
+                            <div class="input-group-append">
+                                <button class="btn btn-outline-secondary" type="button" id="emoji-picker">😀</button>
+                                <button class="btn btn-outline-success" type="submit" id="submit-chat-msg">Send</button>
+                                <button type="button" class="btn btn-outline-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="sr-only">Toggle Sender List</span>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" @click.prevent="sendChatMessage()">Send to all</a>
+                                    <a class="dropdown-item" href="#" @click.prevent="sendChatMessage({team: 'leaders'})">Send to leaders</a>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
             </div>
         </div>
         <div v-else class="col-4 offset-4">
@@ -105,6 +117,9 @@
 </template>
 
 <script>
+    import EmojiButton from '@joeattardi/emoji-button';
+    import marked from 'marked';
+
     export default {
         mounted() {
 
@@ -196,10 +211,11 @@
                     picker.togglePicker(emojiButton);
                 });
             },
-            sendChatMessage() {
+            sendChatMessage(options = null) {
                 this.socket.send(`{
                             "type": "chat_send",
-                            "msg": "${this.addslashes(this.chatmsg)}"
+                            "msg": "${this.addslashes(this.chatmsg)}",
+                            "options": ${JSON.stringify(options)}
                         }`);
                 this.chatmsg = '';
             },
@@ -317,6 +333,9 @@
             },
             wordRevealed(row, col) {
                 return this.getWord(row, col).revealed;
+            },
+            formatMarkdown(text) {
+                return marked(text);
             }
         },
         data() {
@@ -341,9 +360,14 @@
         computed: {
             filteredChats() {
                 if(this.showSystemMessages) {
-                    return this.chats;
+                    return this.chats.filter(c => {
+                        return !c.team || (c.team === 'leaders' && this.isLeader);
+                    });
                 } else {
-                    return this.chats.filter(c => !c.isSystem);
+                    return this.chats.filter(c => {
+                        return !c.isSystem &&
+                            (!c.team || (c.team === 'leaders' && this.isLeader));
+                    });
                 }
             },
             teamName() {
diff --git a/src/sass/_style.scss b/src/sass/_style.scss
index 32d9243..41a7327 100644
--- a/src/sass/_style.scss
+++ b/src/sass/_style.scss
@@ -5,3 +5,8 @@
 #emoji-picker {
   font-family: $font-family-emoji;
 }
+
+.chat-msg-content  p {
+  padding: 0 !important;
+  margin: 0 !important;
+}