diff --git a/commands/interaction/slash/info/user.js b/commands/interaction/slash/info/user.js
index 1bf5ee0..650ab45 100644
--- a/commands/interaction/slash/info/user.js
+++ b/commands/interaction/slash/info/user.js
@@ -56,6 +56,12 @@ module.exports = {
       if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
   
       usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
+
+      // Badge Container
+      let b = renderBadges(u)
+      if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
+
+      if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
       if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
   
       let userCard = createEmbed("default", context, {
@@ -85,17 +91,7 @@ module.exports = {
           inline: true
         })
       }
-  
-      // Badge Container
-      let b = renderBadges(u)
-      if (u.avatarUrl.endsWith('.gif') || u.banner) { b.push(BADGE_ICONS.nitro) }
-      if (b.length >= 1) {
-        userCard.fields.push({
-          name: `${icon("nitro")} Badges`,
-          value: b.join(''),
-          inline: true
-        })
-      }
+
       return editOrReply(context, userCard)
     }catch(e){
       console.log(e)
diff --git a/commands/interaction/user/user.js b/commands/interaction/user/user.js
index 3370419..304a981 100644
--- a/commands/interaction/user/user.js
+++ b/commands/interaction/user/user.js
@@ -35,6 +35,12 @@ module.exports = {
       if (u.discriminator && u.discriminator !== "0") usernameDisplay += `#${u.discriminator}`
   
       usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
+      
+      // Badge Container
+      let b = renderBadges(u)
+      if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
+
+      if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
       if (m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
   
       let userCard = createEmbed("default", context, {
@@ -65,16 +71,6 @@ module.exports = {
         })
       }
   
-      // Badge Container
-      let b = renderBadges(u)
-      if (u.avatarUrl.endsWith('.gif') || u.banner) { b.push(BADGE_ICONS.nitro) }
-      if (b.length >= 1) {
-        userCard.fields.push({
-          name: `${icon("nitro")} Badges`,
-          value: b.join(''),
-          inline: true
-        })
-      }
       return editOrReply(context, userCard)
     }catch(e){
       console.log(e)
diff --git a/commands/message/info/user.js b/commands/message/info/user.js
index 75c39da..29c421f 100644
--- a/commands/message/info/user.js
+++ b/commands/message/info/user.js
@@ -47,6 +47,10 @@ module.exports = {
 
       usernameDisplay = `**@${usernameDisplay}**${botTag} ${highlight(`(${u.id})`)}`
 
+      // Badge Container
+      let b = renderBadges(u)
+      if(b.length >= 1) usernameDisplay += `\n${b.join('')}\n`
+
       if(u.globalName !== null) usernameDisplay += `\n${smallIconPill("user_card", "Display Name")} ${smallPill(u.globalName)}`
       if(m && m.nick !== null) usernameDisplay += `\n${smallIconPill("user_card", "Nickname")} ${smallPill(m.nick)}`
 
@@ -77,18 +81,6 @@ module.exports = {
           inline: true
         })
       }
-
-      // Badge Container
-      let b = renderBadges(u)
-      if(u.avatarUrl.endsWith('.gif') || u.banner){ b.push(BADGE_ICONS.nitro)}
-      if(b.length >= 1){
-        userCard.fields.push({
-          name: `${icon("nitro")} Badges`,
-          value: b.join(''),
-          inline: true
-        })
-      }
-
       
       if(!m?.banner && m) u.member = await context.guild.fetchMember(u.id)
         
diff --git a/labscore/utils/users.js b/labscore/utils/users.js
index 5f3cbe4..2e3635b 100644
--- a/labscore/utils/users.js
+++ b/labscore/utils/users.js
@@ -40,8 +40,14 @@ const { Constants } = require('detritus-client');
 const { UserFlags } = Constants
 
 const { BADGE_ICONS } = require('../constants');
+const { link } = require('./markdown');
 
 const BADGE_TYPES = Object.freeze({
+  "nitro": {
+    description: "Discord Nitro",
+    link: "https://discord.com/nitro",
+    icon: BADGE_ICONS.nitro
+  },
   "staff": {
     description: "Discord Staff",
     link: "https://discord.com/company",
@@ -121,7 +127,9 @@ const BADGES = Object.freeze({
 
 function renderBadges(user){
   let badges = [];
-  for(const flag of Object.keys(BADGES)) if(user.hasFlag(BADGES[flag])) badges.push(BADGE_TYPES[flag].icon)
+  for(const flag of Object.keys(BADGES)) if(user.hasFlag(BADGES[flag])) badges.push(link(BADGE_TYPES[flag].link), BADGE_TYPES[flag].icon, BADGE_TYPES[flag].description)
+  if(!user.bot && (user.avatarUrl.endsWith('.gif') || user.banner)) { badges.push(link(BADGE_TYPES["nitro"].link, BADGE_TYPES["nitro"].icon, BADGE_TYPES["nitro"].description)) }
+
   return badges;
 }