diff --git a/daemon.py b/daemon.py
index cfe892b..6c17663 100755
--- a/daemon.py
+++ b/daemon.py
@@ -447,24 +447,28 @@ def unsubscribe():
 
 def listSubscriptions():
     global usrPrompt
-    #jsonAddresses = json.loads(api.listSubscriptions())
-    #numAddresses = len(jsonAddresses['addresses']) #Number of addresses
-    print '\nLabel, Address, Enabled\n'
     try:
-        print api.listSubscriptions()
+        response = api.listSubscriptions()
+        if "API Error" in response:
+            return getAPIErrorCode(response)
+        subs = json.loads(response)
+        print
+        print '--------------------------------------------------------------------------------'
+        print '|             Label              |                Address                | On? |'
+        print '|--------------------------------|---------------------------------------|-----|'
+        for entry in subs['subscriptions']:
+            label = entry['label'].decode('base64')
+            address = entry['address']
+            enabled = "Yes" if entry['enabled'] else "No"
+            if (len(label) > 30): label = label[:27] + '...'
+            print '| ' + label.ljust(30) + ' | ' + address.ljust(37) + ' | ' + enabled.ljust(3) + ' |'
+        print '--------------------------------------------------------------------------------'
+        print
+
     except:
         print '\n     Connection Error\n'
         usrPrompt = 0
         main()
-        
-    '''for addNum in range (0, numAddresses): #processes all of the addresses and lists them out
-        label = jsonAddresses['addresses'][addNum]['label']
-        address = jsonAddresses['addresses'][addNum]['address']
-        enabled = jsonAddresses['addresses'][addNum]['enabled']
-
-        print label, address, enabled
-    '''
-    print ' '
 
 def createChan():
     global usrPrompt
@@ -1277,12 +1281,12 @@ def UI(usrInput): #Main user menu
         print '     |------------------------|----------------------------------------------|'
         print '     | subscribe              | Subscribes to an address                     |'
         print '     | unsubscribe            | Unsubscribes from an address                 |'
-       #print '     | listSubscriptions      | Lists all of the subscriptions.              |'
+        print '     | listSubscriptions      | Lists all of the subscriptions.              |'
+        print '     |------------------------|----------------------------------------------|'
+        print '     | createChannel          | Creates a channel                            |'
+        print '     | joinChannel            | Joins a channel                              |'
+        print '     | leaveChannel           | Leaves a channel                             |'
         print '     |------------------------|----------------------------------------------|'
-	print '     | create                 | Creates a channel                            |'
-        print '     | join                   | Joins a channel                              |'
-        print '     | leave                  | Leaves a channel                             |'
-	print '     |------------------------|----------------------------------------------|'
         print '     | inbox                  | Lists the message information for the inbox  |'
         print '     | outbox                 | Lists the message information for the outbox |'
         print '     | send                   | Send a new message or broadcast              |'
@@ -1397,21 +1401,22 @@ def UI(usrInput): #Main user menu
         usrPrompt = 1
         main()
     elif usrInput == "listsubscriptions": #Unsubscribe from an address
-        listSubscriptions()
+        res = listSubscriptions()
+        if res == 20: print '\n     Error: API function not supported.\n'
         usrPrompt = 1
         main()
 
-    elif usrInput == "create":
+    elif usrInput == "createchan" or usrInput == "createchannel":
         createChan()
         userPrompt = 1
         main()
 
-    elif usrInput == "join":
+    elif usrInput == "joinchan" or usrInput == "joinchannel":
         joinChan()
         userPrompt = 1
         main()
         
-    elif usrInput == "leave":
+    elif usrInput == "leavechan" or usrInput == "leavechannel":
         leaveChan()
         userPrompt = 1
         main()