diff --git a/src/bot.js b/src/bot.js
index 2eb45db..44d89a7 100644
--- a/src/bot.js
+++ b/src/bot.js
@@ -1037,8 +1037,11 @@ async function sendLockerImageEmbed(message, { title, description, imageBuffer,
     : String(title || 'Locker Check');
   const embed = new EmbedBuilder()
     .setColor(0xcccccc)
-    .setAuthor(`${displayName} (${author})`)
-    .setDescription(description)
+    .setAuthor({ 
+      name: `${displayName} (${message.author.username})`, 
+      iconURL: message.author.displayAvatarURL() 
+    })
+    .setDescription(`**${title}**\n${description}`)
     .setImage(`attachment://${fileName}`)
     .setFooter({
       text: `1-800 @ ${message.guild.name}`,
@@ -2145,7 +2148,7 @@ client.on('messageCreate', async (message) => {
       }
 
       //await message.author.send(`Building your full locker (${categories.length} categories)...`);
-      await message.author.send({
+      let building_msg = await message.author.send({
         content: null, embeds: [{
           color: 0xcccccc,
           title: '',
@@ -2179,15 +2182,18 @@ client.on('messageCreate', async (message) => {
 
         if (img) {
           await sendLockerImageEmbed(message, {
-            title: `${displayName} - ${cat.label}`,
+            title: `${cat.label}`,
             description: cat.subtitle,
             imageBuffer: img,
             fileName: `${cat.label.toLowerCase().replace(/\s/g, '_')}.png`,
+            author: message.author.username,
+            displayName: displayName
           });
         }
 
         await new Promise(r => setTimeout(r, 500));
       }
+      building_msg.delete();
 
     } catch (err) {
       console.error('locker image error:', err.message);