diff --git a/devjs/core.js b/devjs/core.js
index 7b4999e8..1c2d30d9 100644
--- a/devjs/core.js
+++ b/devjs/core.js
@@ -30,7 +30,7 @@ var settings = {
     "Save logs locally":          { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented":false },
     "Public Servers":             { "id": "bda-gs-1", "info": "Display public servers", "implemented":false},
     "Minimal Mode":               { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented":true},
-    "Voidce Mode":                { "id": "bda-gs-4", "info": "Only show voice chat", "implemented":true},
+    "Voice Mode":                { "id": "bda-gs-4", "info": "Only show voice chat", "implemented":true},
     "Hide Channels":              { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented":true},
     "Quick Emote Menu":           { "id": "bda-es-0", "info": "Show quick emote menu for adding emotes", "implemented":true },
     "FrankerFaceZ Emotes":        { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented":true },
@@ -73,6 +73,9 @@ Core.prototype.init = function() {
     //Incase were too fast
     function gwDefer() {
         if($(".guilds-wrapper").size() > 0) {
+
+
+            $(".guilds li:first-child").after($("<li/>", { css: { "height": "20px" } }).append($("<div/>", { class: "guild-inner", css: { "height": "20px" } }).append($("<a/>").append($("<div/>", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" })))));
             $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button" })))));
 
             settingsPanel = new SettingsPanel();
@@ -84,6 +87,7 @@ Core.prototype.init = function() {
             quickEmoteMenu.init(false);
 
             $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
+            $("#bd-pub-button").on("click", function(e) { opublicServers.show(); });
 
         } else {
             setTimeout(gwDefer(), 100);
diff --git a/devjs/main.js b/devjs/main.js
index 89c04ad4..ddd27dd6 100644
--- a/devjs/main.js
+++ b/devjs/main.js
@@ -30,7 +30,7 @@ var settings = {
     "Save logs locally":          { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented":false },
     "Public Servers":             { "id": "bda-gs-1", "info": "Display public servers", "implemented":false},
     "Minimal Mode":               { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented":true},
-    "Voidce Mode":                { "id": "bda-gs-4", "info": "Only show voice chat", "implemented":true},
+    "Voice Mode":                { "id": "bda-gs-4", "info": "Only show voice chat", "implemented":true},
     "Hide Channels":              { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented":true},
     "Quick Emote Menu":           { "id": "bda-es-0", "info": "Show quick emote menu for adding emotes", "implemented":true },
     "FrankerFaceZ Emotes":        { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented":true },
@@ -73,6 +73,9 @@ Core.prototype.init = function() {
     //Incase were too fast
     function gwDefer() {
         if($(".guilds-wrapper").size() > 0) {
+
+
+            $(".guilds li:first-child").after($("<li/>", { css: { "height": "20px" } }).append($("<div/>", { class: "guild-inner", css: { "height": "20px" } }).append($("<a/>").append($("<div/>", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" })))));
             $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button" })))));
 
             settingsPanel = new SettingsPanel();
@@ -84,6 +87,7 @@ Core.prototype.init = function() {
             quickEmoteMenu.init(false);
 
             $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
+            $("#bd-pub-button").on("click", function(e) { opublicServers.show(); });
 
         } else {
             setTimeout(gwDefer(), 100);
@@ -285,9 +289,13 @@ function PublicServers() {
 
 }
 
+SettingsPanel.prototype.getPanel = function() {
+    return this.container;
+}
+
 PublicServers.prototype.init = function() {
 
-    var container = $("<div/>", {
+    this.container = $("<div/>", {
         id: "bd-ps-container"
     });
 
@@ -304,13 +312,13 @@ PublicServers.prototype.init = function() {
         text: "X"
     }).appendTo(header);
 
-    header.appendTo(container);
+    header.appendTo(this.getPanel());
 
     var psbody = $("<div/>", {
         id: "bd-ps-body"
     });
 
-    psbody.appendTo(container);
+    psbody.appendTo(this.getPanel());
 
     var table = $("<table/>", {
         border:"0"
@@ -342,7 +350,7 @@ PublicServers.prototype.init = function() {
 
     table.appendTo(psbody);
 
-    $("body").append(container);
+    $("body").append(this.getPanel());
 
 
     var servers = publicServers.servers;
@@ -394,6 +402,11 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
     tableBody.append(tr);
 }
 
+SettingsPanel.prototype.show = function() {
+    this.getPanel().toggle();
+}
+
+
 /* BetterDiscordApp QuickEmoteMenu JavaScript
  * Version: 1.3
  * Author: Jiiks | http://jiiks.net
diff --git a/devjs/publicservers.js b/devjs/publicservers.js
index 8c3dc427..e3cb06a6 100644
--- a/devjs/publicservers.js
+++ b/devjs/publicservers.js
@@ -11,9 +11,13 @@ function PublicServers() {
 
 }
 
+SettingsPanel.prototype.getPanel = function() {
+    return this.container;
+}
+
 PublicServers.prototype.init = function() {
 
-    var container = $("<div/>", {
+    this.container = $("<div/>", {
         id: "bd-ps-container"
     });
 
@@ -30,13 +34,13 @@ PublicServers.prototype.init = function() {
         text: "X"
     }).appendTo(header);
 
-    header.appendTo(container);
+    header.appendTo(this.getPanel());
 
     var psbody = $("<div/>", {
         id: "bd-ps-body"
     });
 
-    psbody.appendTo(container);
+    psbody.appendTo(this.getPanel());
 
     var table = $("<table/>", {
         border:"0"
@@ -68,7 +72,7 @@ PublicServers.prototype.init = function() {
 
     table.appendTo(psbody);
 
-    $("body").append(container);
+    $("body").append(this.getPanel());
 
 
     var servers = publicServers.servers;
@@ -118,4 +122,8 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
     tr.append(desc);
 
     tableBody.append(tr);
-}
\ No newline at end of file
+}
+
+SettingsPanel.prototype.show = function() {
+    this.getPanel().toggle();
+}