diff --git a/api/source/api_modules/classroom_compliance/api.d b/api/source/api_modules/classroom_compliance/api.d
index 5cc692f..ee24897 100644
--- a/api/source/api_modules/classroom_compliance/api.d
+++ b/api/source/api_modules/classroom_compliance/api.d
@@ -19,6 +19,7 @@ void registerApiEndpoints(PathHandler handler) {
     handler.addMapping(Method.GET, CLASS_PATH ~ "/notes", &getClassNotes);
     handler.addMapping(Method.POST, CLASS_PATH ~ "/notes", &createClassNote);
     handler.addMapping(Method.DELETE, CLASS_PATH ~ "/notes/:noteId:ulong", &deleteClassNote);
+    handler.addMapping(Method.PUT, CLASS_PATH ~ "/reset-desk-numbers", &resetStudentDesks);
 
     handler.addMapping(Method.POST, CLASS_PATH ~ "/students", &createStudent);
     handler.addMapping(Method.GET, CLASS_PATH ~ "/students", &getStudents);
diff --git a/api/source/api_modules/classroom_compliance/api_class.d b/api/source/api_modules/classroom_compliance/api_class.d
index f763baa..31568ac 100644
--- a/api/source/api_modules/classroom_compliance/api_class.d
+++ b/api/source/api_modules/classroom_compliance/api_class.d
@@ -141,3 +141,12 @@ void deleteClassNote(ref HttpRequestContext ctx) {
     const query = "DELETE FROM classroom_compliance_class_note WHERE class_id = ? AND id = ?";
     update(conn, query, cls.id, noteId);
 }
+
+void resetStudentDesks(ref HttpRequestContext ctx) {
+    Connection conn = getDb();
+    scope(exit) conn.close();
+    User user = getUserOrThrow(ctx, conn);
+    auto cls = getClassOrThrow(ctx, conn, user);
+    const query = "UPDATE classroom_compliance_student SET desk_number = 0 WHERE class_id = ?";
+    update(conn, query, cls.id);
+}
diff --git a/app/src/api/classroom_compliance.ts b/app/src/api/classroom_compliance.ts
index cd14cc3..936de2e 100644
--- a/app/src/api/classroom_compliance.ts
+++ b/app/src/api/classroom_compliance.ts
@@ -1,4 +1,4 @@
-import { APIClient, type APIResponse, type AuthStoreType } from './base'
+import { APIClient, APIResponse, type AuthStoreType } from './base'
 
 export const BASE_URL = import.meta.env.VITE_API_URL + '/classroom-compliance'
 
@@ -140,6 +140,15 @@ export class ClassroomComplianceAPIClient extends APIClient {
     return super.delete(`/classes/${classId}/notes/${noteId}`)
   }
 
+  resetStudentDesks(classId: number): APIResponse<void> {
+    const url = `/classes/${classId}/reset-desk-numbers`
+    const promise = fetch(this.baseUrl + url, {
+      headers: this.getAuthHeaders(),
+      method: 'PUT',
+    })
+    return new APIResponse(this.handleAPIResponseWithNoBody(promise))
+  }
+
   getStudents(classId: number): APIResponse<Student[]> {
     return super.get(`/classes/${classId}/students`)
   }
diff --git a/app/src/apps/classroom_compliance/ClassView.vue b/app/src/apps/classroom_compliance/ClassView.vue
index fc82057..d3c5aa8 100644
--- a/app/src/apps/classroom_compliance/ClassView.vue
+++ b/app/src/apps/classroom_compliance/ClassView.vue
@@ -15,10 +15,17 @@ const router = useRouter()
 const cls: Ref<Class | null> = ref(null)
 const notes: Ref<ClassNote[]> = ref([])
 const noteContent: Ref<string> = ref('')
+
+const entriesTable = useTemplateRef('entries-table')
+
 const apiClient = new ClassroomComplianceAPIClient(authStore)
 
 const deleteClassDialog = useTemplateRef('deleteClassDialog')
 onMounted(() => {
+  loadClass()
+})
+
+function loadClass() {
   const idNumber = parseInt(props.id, 10)
   apiClient.getClass(idNumber).handleErrorsWithAlert().then(result => {
     if (result) {
@@ -28,7 +35,7 @@ onMounted(() => {
       router.back();
     }
   })
-})
+}
 
 async function deleteThisClass() {
   if (!cls.value || !(await deleteClassDialog.value?.show())) return
@@ -61,6 +68,13 @@ function refreshNotes() {
     }
   })
 }
+
+async function resetStudentDesks() {
+  if (!cls.value) return
+  await apiClient.resetStudentDesks(cls.value.id).handleErrorsWithAlert()
+  // Reload the table!
+  await entriesTable.value?.loadEntries()
+}
 </script>
 <template>
   <div v-if="cls">
@@ -71,6 +85,7 @@ function refreshNotes() {
         Student</button>
       <button type="button" @click="router.push(`/classroom-compliance/classes/${cls.id}/import-students`)">Import
         Students</button>
+      <button type="button" @click="resetStudentDesks">Clear Assigned Desks</button>
       <button type="button" @click="deleteThisClass">Delete this Class</button>
     </div>
 
@@ -82,7 +97,7 @@ function refreshNotes() {
     </form>
     <ClassNoteItem v-for="note in notes" :key="note.id" :note="note" @noteDeleted="refreshNotes()" />
 
-    <EntriesTable :classId="cls.id" />
+    <EntriesTable :classId="cls.id" ref="entries-table" />
 
     <!-- Confirmation dialog used for attempts at deleting this class. -->
     <ConfirmDialog ref="deleteClassDialog">
diff --git a/app/src/apps/classroom_compliance/EntriesTable.vue b/app/src/apps/classroom_compliance/EntriesTable.vue
index 3c2210f..a9a39a7 100644
--- a/app/src/apps/classroom_compliance/EntriesTable.vue
+++ b/app/src/apps/classroom_compliance/EntriesTable.vue
@@ -237,6 +237,10 @@ function addAllEntriesForDate(dateStr: string) {
     }
   }
 }
+
+defineExpose({
+  loadEntries
+})
 </script>
 <template>
   <div>
@@ -272,6 +276,7 @@ function addAllEntriesForDate(dateStr: string) {
     <table class="entries-table" :class="{ 'entries-table-reduced-view': selectedView !== TableView.FULL }">
       <thead>
         <tr>
+          <th v-if="selectedView !== TableView.WHITEBOARD">#</th>
           <th>Student</th>
           <th v-if="assignedDesks">Desk</th>
           <DateHeaderCell v-for="date in getVisibleDates()" :key="date" :date-str="date"
@@ -280,7 +285,9 @@ function addAllEntriesForDate(dateStr: string) {
         </tr>
       </thead>
       <tbody>
-        <tr v-for="student in students" :key="student.id">
+        <tr v-for="(student, idx) in students" :key="student.id" style="height: 2em;">
+          <td v-if="selectedView !== TableView.WHITEBOARD" style="text-align: right; padding-right: 0.5em;">{{ idx + 1
+            }}.</td>
           <StudentNameCell :student="student" :class-id="classId" />
           <!-- Desk Number: -->
           <td v-if="assignedDesks" v-text="student.deskNumber"></td>
diff --git a/app/src/apps/classroom_compliance/entries_table/StudentNameCell.vue b/app/src/apps/classroom_compliance/entries_table/StudentNameCell.vue
index 3fda942..97721ef 100644
--- a/app/src/apps/classroom_compliance/entries_table/StudentNameCell.vue
+++ b/app/src/apps/classroom_compliance/entries_table/StudentNameCell.vue
@@ -6,19 +6,29 @@ defineProps<{
 }>()
 </script>
 <template>
-  <td :class="{ 'student-removed': student.removed }">
+  <td class="student-name-cell" :class="{ 'student-removed': student.removed }">
     <RouterLink :to="'/classroom-compliance/classes/' + classId + '/students/' + student.id" class="student-link">
-      <span v-text="student.name"></span>
+      {{ student.name }}
     </RouterLink>
   </td>
 </template>
 <style scoped>
+.student-name-cell {
+  padding-left: 0.5em;
+  text-align: left;
+}
+
 .student-link {
   text-decoration: none;
   color: inherit;
 }
 
+.student-link:hover {
+  text-decoration: underline;
+}
+
 .student-removed {
   text-decoration: line-through;
+  color: gray;
 }
 </style>