diff --git a/onionr/static-data/default-plugins/clandestine/controlapi.py b/onionr/static-data/default-plugins/clandestine/controlapi.py
index 773e9c36..e40de9b6 100755
--- a/onionr/static-data/default-plugins/clandestine/controlapi.py
+++ b/onionr/static-data/default-plugins/clandestine/controlapi.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     HTTP endpoints for controlling IMs
 '''
diff --git a/onionr/static-data/default-plugins/clandestine/main.py b/onionr/static-data/default-plugins/clandestine/main.py
index 17007f0e..29afa3e1 100755
--- a/onionr/static-data/default-plugins/clandestine/main.py
+++ b/onionr/static-data/default-plugins/clandestine/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     Instant message conversations with Onionr peers
 '''
diff --git a/onionr/static-data/default-plugins/clandestine/peerserver.py b/onionr/static-data/default-plugins/clandestine/peerserver.py
index 5fe92fe9..5e4fba25 100755
--- a/onionr/static-data/default-plugins/clandestine/peerserver.py
+++ b/onionr/static-data/default-plugins/clandestine/peerserver.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     HTTP endpoints for communicating with peers
 '''
diff --git a/onionr/static-data/default-plugins/cliui/main.py b/onionr/static-data/default-plugins/cliui/main.py
index 5f47c455..f6a0b906 100755
--- a/onionr/static-data/default-plugins/cliui/main.py
+++ b/onionr/static-data/default-plugins/cliui/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This is an interactive menu-driven CLI interface for Onionr
 '''
diff --git a/onionr/static-data/default-plugins/contactmanager/main.py b/onionr/static-data/default-plugins/contactmanager/main.py
index bdf6ac5b..d6c4499c 100755
--- a/onionr/static-data/default-plugins/contactmanager/main.py
+++ b/onionr/static-data/default-plugins/contactmanager/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This is an interactive menu-driven CLI interface for Onionr
 '''
diff --git a/onionr/static-data/default-plugins/flow/flowapi.py b/onionr/static-data/default-plugins/flow/flowapi.py
index 95d5fb4f..09b54629 100755
--- a/onionr/static-data/default-plugins/flow/flowapi.py
+++ b/onionr/static-data/default-plugins/flow/flowapi.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     This file primarily serves to allow specific fetching of flow board messages
 '''
diff --git a/onionr/static-data/default-plugins/flow/main.py b/onionr/static-data/default-plugins/flow/main.py
index 0162019f..63c86cbc 100755
--- a/onionr/static-data/default-plugins/flow/main.py
+++ b/onionr/static-data/default-plugins/flow/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     This default plugin handles "flow" messages (global chatroom style communication)
 '''
diff --git a/onionr/static-data/default-plugins/metadataprocessor/main.py b/onionr/static-data/default-plugins/metadataprocessor/main.py
index 5feb4305..333c68aa 100755
--- a/onionr/static-data/default-plugins/metadataprocessor/main.py
+++ b/onionr/static-data/default-plugins/metadataprocessor/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This processes metadata for Onionr blocks
 '''
diff --git a/onionr/static-data/default-plugins/pms/loadinbox.py b/onionr/static-data/default-plugins/pms/loadinbox.py
index 996d8f06..b4011b00 100755
--- a/onionr/static-data/default-plugins/pms/loadinbox.py
+++ b/onionr/static-data/default-plugins/pms/loadinbox.py
@@ -1,3 +1,22 @@
+'''
+    Onionr - Private P2P Communication
+
+    Load the user's inbox and return it as a list
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+'''
 import onionrblockapi
 def load_inbox(myCore):
     inbox_list = []
diff --git a/onionr/static-data/default-plugins/pms/mailapi.py b/onionr/static-data/default-plugins/pms/mailapi.py
index 2ba99d08..af59bd93 100755
--- a/onionr/static-data/default-plugins/pms/mailapi.py
+++ b/onionr/static-data/default-plugins/pms/mailapi.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     HTTP endpoints for mail plugin.
 '''
diff --git a/onionr/static-data/default-plugins/pms/main.py b/onionr/static-data/default-plugins/pms/main.py
index e91a153c..e594c368 100755
--- a/onionr/static-data/default-plugins/pms/main.py
+++ b/onionr/static-data/default-plugins/pms/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Anonymous Storage Network
+    Onionr - Private P2P Communication
 
     This default plugin handles private messages in an email like fashion
 '''
diff --git a/onionr/static-data/default-plugins/pms/sentboxdb.py b/onionr/static-data/default-plugins/pms/sentboxdb.py
index 28a5de6f..7090e214 100755
--- a/onionr/static-data/default-plugins/pms/sentboxdb.py
+++ b/onionr/static-data/default-plugins/pms/sentboxdb.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - Private P2P Communication
 
     This file handles the sentbox for the mail plugin
 '''
diff --git a/onionr/static-data/www/clandestine/index.html b/onionr/static-data/www/clandestine/index.html
index 91bc2e07..7fc0cab0 100755
--- a/onionr/static-data/www/clandestine/index.html
+++ b/onionr/static-data/www/clandestine/index.html
@@ -14,6 +14,7 @@
             <img class='logo' src='/shared/images/onionr-icon.png' alt='onionr logo'>
             <span class='logoText'>Clandestine</span>
 
+            <div>Current Used ID: <input class='myPub' type='text'></div>
             <ul class='conversationList'></ul>
         </div>
         <script src='/shared/misc.js'></script>
diff --git a/onionr/static-data/www/clandestine/js/main.js b/onionr/static-data/www/clandestine/js/main.js
index 0e7071a0..a757f713 100755
--- a/onionr/static-data/www/clandestine/js/main.js
+++ b/onionr/static-data/www/clandestine/js/main.js
@@ -1,12 +1,14 @@
-friendList = []
+friendList = {}
 convoListElement = document.getElementsByClassName('conversationList')[0]
 
 function createConvoList(){
-    for (var x = 0; x < friendList.length; x++){
+    console.log(friendList)
+
+    for (friend in friendList){
         var convoEntry = document.createElement('div')
         convoEntry.classList.add('convoEntry')
-        convoEntry.setAttribute('data-pubkey', friendList[x])
-        convoEntry.innerText = friendList[x]
+        convoEntry.setAttribute('data-pubkey', friend)
+        convoEntry.innerText = friendList[friend]
         convoListElement.append(convoEntry)
     }
 }
@@ -20,7 +22,7 @@ fetch('/friends/list', {
     var keys = []
     for(var k in resp) keys.push(k)
     for (var i = 0; i < keys.length; i++){
-        friendList.push(keys[i])
+        friendList[keys[i]] = resp[keys[i]]['name']
     }
     createConvoList()
 })
\ No newline at end of file
diff --git a/onionr/static-data/www/private/index.html b/onionr/static-data/www/private/index.html
index a2d3d3c9..9a548ebd 100755
--- a/onionr/static-data/www/private/index.html
+++ b/onionr/static-data/www/private/index.html
@@ -23,7 +23,7 @@
             <br>
             <button id='shutdownNode' class='btn warnBtn'>Shutdown Node</button> <button id='refreshStats' class='btn primaryBtn'>Refresh Stats</button>
             <br><br>
-            <label>Open Site: <input type='text' id='siteViewer' placeholder='Site Hash'> <button id='openSite' class='primaryBtn openSiteBtn'>Open Onionr Site</button></label>
+            <label>Open Site: <input type='text' id='siteViewer' placeholder='Site Hash'> <button id='openSite' class='btn primaryBtn openSiteBtn'>Open Onionr Site</button></label>
             <br>
             <br><br><a class='idLink' href='/mail/'>Mail</a> - <a class='idLink' href='/friends/'>Friend Manager</a> - <a class='idLink' href='/board/'>Circle</a> - 
                     <a class='idLink' href='/clandestine/'>Clandestine</a>