diff --git a/common-theme/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html
index 6d6d5b24f..3cca49fd7 100644
--- a/common-theme/layouts/_default/backlog.html
+++ b/common-theme/layouts/_default/backlog.html
@@ -14,32 +14,81 @@
       for each repo, grab the issues that match the filter
     */}}
     {{ range $repos }}
+      {{ $setupTasks := slice }}
+      {{ $recurringTasks := slice }}
+      {{ $mandatoryTasks := slice }}
+      {{ $optionalTasks := slice }}
       {{ $issueBlocks := partial "block/issues-list-as-blocks.html" (dict "backlog" . "backlog_filter" $backlog_filter "path" $currentPath) }}
       {{ $repo := . }}    
       {{ range $issueBlocks }}
-        <div class="c-alert" role="alert" hidden>
-          <span class="alert__message"></span>
-          <button aria-label="Close" class="clean-btn close" type="button">
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-        <details class="c-issue">
-          <summary class="c-issue__title e-heading__3">
-            {{ .name }}
-            <a class="c-issue__link" href="{{ .src }}">🔗</a>
-            <a
-              href="https://curriculum.codeyourfuture.io/api/clone?state={{ dict "issue" .number "module" $repo "sprint" $backlog_filter "prevURL" (urls.AbsLangURL $currentPath) | jsonify }}"
-              class="e-button"
-              data-props="{{ .Page.RelPermalink }}">
-              Clone
-            </a>
-          </summary>
-          <div class="c-issue__body">
-            {{ partial "block/block.html" (dict "block" . "Page"
-              $.Page "Site" site )
-            }}
-          </div>
-        </details>
+        {{ $issue := . }}
+        {{ range .labels.nodes }}
+          {{if in .name "Recurring"}}
+            {{ $recurringTasks = $recurringTasks | append $issue }}
+          {{else if in .name "Setup"}}
+            {{ $setupTasks = $setupTasks | append $issue }}
+          {{else if in .name "Core"}}
+            {{ $mandatoryTasks = $mandatoryTasks | append $issue }}
+          {{else if in .name "Optional"}}
+            {{ $optionalTasks = $optionalTasks | append $issue }}
+          {{ end }}
+        {{ end }}
+      {{ end }}
+      {{ if lt 0 ($setupTasks | len) }}
+        <h2>Start Here</h2>
+        <p>These tasks should be completed before attempting anything else.</p>
+        {{range $setupTasks}} 
+          {{ partial "block/backlog-issue.html" (dict 
+            "block" . 
+            "Page" $.Page 
+            "Site" site 
+            "repo" $repo
+            "sprint" $backlog_filter
+            "path" $currentPath
+          ) }}
+        {{ end }}
+      {{ end }}
+      {{ if lt 0 ($recurringTasks | len) }}
+        <h2>Recurring Tasks</h2>
+        <p>These tasks need to be completed in every sprint.</p>
+        {{range $recurringTasks}} 
+          {{ partial "block/backlog-issue.html" (dict 
+            "block" . 
+            "Page" $.Page 
+            "Site" site 
+            "repo" $repo
+            "sprint" $backlog_filter
+            "path" $currentPath
+          ) }}
+        {{ end }}
+      {{ end }}
+      {{ if lt 0 ($mandatoryTasks | len) }}
+        <h2>Mandatory Tasks</h2>
+        <p>These tasks will help consolidate your learning for this sprint. You should complete as many of these as possible before class on Saturday.</p>
+        {{range $mandatoryTasks}}
+          {{ partial "block/backlog-issue.html" (dict
+            "block" .
+            "Page" $.Page
+            "Site" site
+            "repo" $repo
+            "sprint" $backlog_filter
+            "path" $currentPath
+          ) }}
+        {{ end }}
+      {{ end }}
+      {{ if lt 0 ($optionalTasks | len) }}
+        <h2>Optional Tasks</h2>
+        <p>These are optional "stretch goals" to attempt when you have finished the mandatory tasks. They may be more challenging or require some additional research.</p>
+        {{range $optionalTasks}}
+          {{ partial "block/backlog-issue.html" (dict
+            "block" .
+            "Page" $.Page
+            "Site" site
+            "repo" $repo
+            "sprint" $backlog_filter
+            "path" $currentPath
+          ) }}
+        {{ end }}
       {{ end }}
     {{ end }}
   </article>
diff --git a/common-theme/layouts/partials/block/backlog-issue.html b/common-theme/layouts/partials/block/backlog-issue.html
new file mode 100644
index 000000000..b18c9a3f4
--- /dev/null
+++ b/common-theme/layouts/partials/block/backlog-issue.html
@@ -0,0 +1,18 @@
+<details class="c-issue">
+    <summary class="c-issue__title e-heading__3">
+        {{ .block.name }}
+        <a class="c-issue__link" href="{{ .src }}">🔗</a>
+        <a href="https://curriculum.codeyourfuture.io/api/clone?state={{ dict " issue" .number "module" .repo "sprint"
+            .sprint "prevURL" (urls.AbsLangURL .path) | jsonify }}" class="e-button"
+            data-props="{{ .Page.RelPermalink }}">
+            Clone
+        </a>
+    </summary>
+    <div class="c-issue__body">
+        {{ partial "block/block.html" (dict
+            "block" .block
+            "Page" $.Page
+            "Site" site
+        ) }}
+    </div>
+</details>
\ No newline at end of file
diff --git a/common-theme/layouts/partials/block/issue.html b/common-theme/layouts/partials/block/issue.html
index 23e22ca6c..5a68e950b 100644
--- a/common-theme/layouts/partials/block/issue.html
+++ b/common-theme/layouts/partials/block/issue.html
@@ -40,18 +40,5 @@ <h3 class="e-heading__4">Learning Objectives</h3>
     <div class="c-block__content c-copy">
       {{ $response.body | page.RenderString }}
     </div>
-    {{ with $response.labels }}
-      <ul class="c-issue__labels c-label__list">
-        {{ range . }}
-          <li class="c-issue__label c-label" style="--color:#{{ .color }}4d">
-            <span
-              class="c-issue__label-name c-label__name"
-              title="{{ .description }}">
-              {{ .name }}
-            </span>
-          </li>
-        {{ end }}
-      </ul>
-    {{ end }}
   </section>
 {{ end }}
diff --git a/common-theme/layouts/partials/block/issues-list-as-blocks.html b/common-theme/layouts/partials/block/issues-list-as-blocks.html
index 741654026..6f13bb4f1 100644
--- a/common-theme/layouts/partials/block/issues-list-as-blocks.html
+++ b/common-theme/layouts/partials/block/issues-list-as-blocks.html
@@ -30,7 +30,7 @@
         url
         number
         labels(
-          first: 25 
+          first: 50 
           orderBy: { 
           direction: DESC 
           field: NAME