diff --git a/Reuse/getLeaderboard.py b/Reuse/getLeaderboard.py
index 1fea181..8c59af8 100644
--- a/Reuse/getLeaderboard.py
+++ b/Reuse/getLeaderboard.py
@@ -1,3 +1,4 @@
+import discord
 import requests
 
 def getleaderboard(board:str, weaponid="", weaponname="", server=""):
@@ -20,21 +21,21 @@ def getleaderboard(board:str, weaponid="", weaponname="", server=""):
             
     result = sorted(players, key=handler, reverse=True)[:10]
 
-    if(board.lower() == "deaths"):
-        inbetween = "to"
-    else:
-        inbetween = "with"
-
     if(server == ""):
-        server = "all servers"
+        server = "all"
     if(weaponname == ""):
-        weaponname = "any weapon"
+        weaponname = "any"
 
-    botmessage = str(f"Leaderboard of {board} {inbetween} {weaponname} for {server}\n-------------------------------\n")
+    botmessage = discord.Embed(title=f"Leaderboard of {board}", description=f"**Server:** {server}\n**Weapon:** {weaponname}", colour=discord.Colour.orange())    
+    if(weaponname != "any"):
+        if(requests.head(f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png").status_code == 200):
+            botmessage.set_thumbnail(url=f"https://toneapi.github.io/ToneAPI_webclient/weapons/{weaponid}.png")
+        else:
+            botmessage.set_thumbnail(url="https://toneapi.github.io/ToneAPI_webclient/weapons/notfound.png")
 
     counter = 1
     for p in result:
-        botmessage = botmessage + str(f"{str(counter):<2}"+ " - " + f"{response[p]['username'] :<20}" + " : "+ f"{str(handler(p)):<8}" + "\n")
+        botmessage.add_field(name="", value=str(str(f"**{str(counter):<2} |** " + f"**{response[p]['username']}" + ":** ") + f'{str(round(handler(p), 1))}' + f"{str(' ' + board.replace('_', ' '))}"), inline=False)
         counter= counter+1 
 
-    return botmessage
\ No newline at end of file
+    return botmessage
diff --git a/cogs/leaderboard.py b/cogs/leaderboard.py
index 782a607..fec44d4 100644
--- a/cogs/leaderboard.py
+++ b/cogs/leaderboard.py
@@ -33,9 +33,7 @@ class Leaderboard(commands.Cog):
         message = list(message)
         message = "".join(message)
         message = message.split(",")
-        print(message)
         async with aiohttp.ClientSession() as session:
-
             for item in message:
                 if(item.lower() in boards):
                     board = item;
@@ -58,7 +56,7 @@ class Leaderboard(commands.Cog):
 
         botmessage = getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
 
-        await ctx.send(f'```{botmessage}```')
+        await ctx.send(embed=botmessage)
 
 
 async def setup(client):