diff --git a/app/dragon-bot.py b/app/dragon-bot.py
index 0cc8c1b3..86f24299 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -230,11 +230,29 @@ async def on_message(message):
         )
 
     if message.content.startswith('!help'):
-        await client.send_message(message.channel, "Sorry {}, But the help command is currently broken. \nIf you'd like to help fix it, take a look at the open issue\nhttp://luker.zzzz.io/gitlab/ldooks/dragon-bot/issues/2".format(message.author.mention))
+        #await client.send_message(message.channel, "Sorry {}, But the help command is currently broken. \nIf you'd like to help fix it, take a look at the open issue\nhttp://luker.zzzz.io/gitlab/ldooks/dragon-bot/issues/2".format(message.author.mention))
         # await client.send_message(
         #     message.author,
         #     help_methods.parse_message(message.content)
         # )
+        
+        if len(message.content) > 5:
+            await client.send_message(message.channel, help_methods.parse_message(message.content))
+        else:
+            description = """Below you can see all the commands I know.
+If you need further help with something join our Support Server. \n
+**Have a nice day!**
+COMMANDS
+{} \n
+**Use `!help <Command>` for more information about a command.** \n
+**Examples:**
+`!help dog` for detailed help for the dog command \n
+**Useful links:**
+johnbest.me""".format(help_methods.parse_message(message.content))
+
+            embed = discord.Embed(title=None, description=description, color=0x428bca, type="rich")
+            embed.set_author(name="Hello! I'm {}".format(client.user.name), icon_url=client.user.default_avatar_url)
+            await client.send_message(message.channel, embed=embed)
 
     if message.content.startswith('!homepage'):
         await client.send_message(
diff --git a/app/help_methods.py b/app/help_methods.py
index 714a49b8..071ea2c4 100644
--- a/app/help_methods.py
+++ b/app/help_methods.py
@@ -1,3 +1,4 @@
+import discord
 def get_help_message(method):
     """
     get_help_message(method)
@@ -103,17 +104,15 @@ def get_help_message(method):
 
     # Print out every help method
     if method == 'show_all':
-        # Might be a better way to do this, but build a list of method : description
-        build_message = []
-        for key, value in supported_methods.items():
-            build_message.append("\n{} : {}\n".format(key, ' '.join(supported_methods[key])))
-        # Join every element of the list with a space
-        message = ' '.join(build_message)
+        commands = ''
+        for key in supported_methods:
+            commands += ('`' + key + '`') + ', '
+        message = commands[:-2]
+
     else:
         # Join key : value of the help method they passed in
-        message = "{} : {}".format(method, ' '.join(supported_methods[method]))
-
-    return "\n{}\n".format(message)
+        message = "```css\n{} : {}\n```".format(method, ' '.join(supported_methods[method]))
+    return message
 
 def parse_message(message):
     method = 'show_all'
@@ -122,5 +121,5 @@ def parse_message(message):
     try:
         explanation = get_help_message(method)
     except KeyError:
-        return "I can't help you with that"
-    return  "```css\n{}\n```".format(explanation)
+        return "This command could not be found."
+    return explanation