diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e2c9f26..865906b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -8,7 +8,10 @@
 </svelte:head>
 
 {#if data.isLoggedIn}
-  <h1>Your Tracks</h1>
+  <hgroup>
+    <h1>Welcome Back</h1>
+    <h2>Tracks from people you're following</h2>
+  </hgroup>
 
   {#if data.tracks.length === 0}
     No tracks!
diff --git a/src/routes/upload/+page.svelte b/src/routes/upload/+page.svelte
index 5bf31f0..9fbdd20 100644
--- a/src/routes/upload/+page.svelte
+++ b/src/routes/upload/+page.svelte
@@ -7,17 +7,17 @@
   <title>Upload | Larsen</title>
 </svelte:head>
 
-<article>
-  <form method="POST" use:enhance>
-    <hgroup>
-      <h1>Upload a New Track</h1>
-      {#if form}
-        <h2 style="color: red">{form?.message}</h2>
-      {:else}
-        <h2>Some good tunes.</h2>
-      {/if}
-    </hgroup>
+<hgroup>
+  <h1>Upload a New Track</h1>
+  <h2>Some good tunes.</h2>
+</hgroup>
 
+<article>
+  {#if form}
+    <p style="color: red">{form?.message}</p>
+  {/if}
+
+  <form method="POST" use:enhance>
     <label for="title">
       Track Title
       <input type="text" name="title" />