diff --git a/src/app/store.js b/src/app/store.js
index b357e60..6ee461a 100644
--- a/src/app/store.js
+++ b/src/app/store.js
@@ -33,17 +33,17 @@ if (isDemo) {
     };
     dataValue = {
         user: demoUserObject,
-        channels: new Array(randomNumber(200, 600)).fill({
+        channels: new Array(randomNumber(200, 600)).fill({}).map(() => ({
             isDM: true,
+            name: 'just-chatting',
             data: {
-                name: 'Awesome Discord Channel',
                 guild: {
-                    name: 'Awesome Discord Server'
+                    name: 'Cool Discord'
                 }
             },
-            messages: [demoMessageObject]
-        }),
-        guilds: new Array(randomNumber(10, 100)).length,
+            messages: new Array(randomNumber(200, 600)).fill(demoMessageObject)
+        })),
+        guilds: new Array(randomNumber(10, 100)),
         applications: [],
         topDMs: new Array(10).fill({}).map(() => ({
             userData: demoUserObject,
diff --git a/src/components/LeaderboardItem.svelte b/src/components/LeaderboardItem.svelte
index d186bc0..4a6f695 100644
--- a/src/components/LeaderboardItem.svelte
+++ b/src/components/LeaderboardItem.svelte
@@ -16,7 +16,7 @@
         {:else}
             <img class="top-avatar" src="{avatarURL}" alt="Avatar" />
         {/if}
-        <h3 class="top-name">{name} <small class="text-muted">{channel ? guild : `#${discriminator}`}</small></h3>
+        <h3 class="top-name">{name} <small class="text-muted channel">{channel ? guild : `#${discriminator}`}</small></h3>
     </div>
     <div class="top-messages">
         <h3>{count} <small>messages</small></h3>
@@ -27,6 +27,9 @@
     .text-muted {
         color: #6c757d;
     }
+    .text-muted.channel {
+        white-space: nowrap;
+    }
     .top-item {
         display: flex;
         flex-direction: row;
diff --git a/src/views/Home.svelte b/src/views/Home.svelte
index 67d146d..e6368bb 100644
--- a/src/views/Home.svelte
+++ b/src/views/Home.svelte
@@ -160,7 +160,7 @@
             </Card>
             <Card name="top-channels">
                 <Leaderboard title="Top Channels" description="The channels you chat the most in!">
-                    {#each channels.filter(c => c.data.name && c.data.guild).sort((a, b) => b.messages.length - a.messages.length).slice(0, 10) as channel, i}
+                    {#each $data.channels.filter(c => c.data && c.data.guild).sort((a, b) => b.messages.length - a.messages.length).slice(0, 10) as channel, i}
                         <LeaderboardItem
                             position={i}
                             name={channel.name}