diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js
index a057c1350395656b22f96e68882c650f1ce74d6a..e31488f688346877e6fc076ba64236ca6b965c63 100644
--- a/src/Mods/Reminder/reminder.js
+++ b/src/Mods/Reminder/reminder.js
@@ -1,11 +1,11 @@
 App.Reminders.add = function(entry, week) {
 	if (entry.length > 0 && week.length > 0 && !isNaN(week)) {
-		if (week <= 0) {
-			V.reminders.overdue.push(`<br>&nbsp;&nbsp;&nbsp;&nbsp;${entry} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.overdue.length}, $reminders.overdue)]]`);
-		} else {
-			V.reminders.entries.push(entry);
-			V.reminders.weeks.push(week);
-			V.reminders.text.push(`<br>&nbsp;&nbsp;&nbsp;&nbsp;${entry} in ${numberWithPlural(week, 'week')} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.text.length}, $reminders.text)]]`);
+			if (week <= 0) {
+				V.reminders.overdue.push(`<br>&nbsp;&nbsp;&nbsp;&nbsp;${entry} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.overdue.length}, $reminders.overdue)]]}`);
+			} else {
+				V.reminders.entries.push(entry);
+				V.reminders.weeks.push(week);
+				V.reminders.text.push(`<br>&nbsp;&nbsp;&nbsp;&nbsp;${entry} in ${numberWithPlural(week, 'week')} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.text.length}, $reminders.text)]]`);
 		}
 	}
 };
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index b3c05a591a500b795b5fca102bbd4d3ddcae874d..267fc91c4129e17ad2674c040dbde7d185f4aed9 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -85,20 +85,20 @@
 	<br>
 <</if>>
 <<if $reminders.overdue.length > 0>>
-	&nbsp;&nbsp;&nbsp;&nbsp;
 	<span class="yellow">	/* TODO: this would be a good place for an "attn" or "attention" class */
-		You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminders")>>:
-		<<print $reminders.overdue>>
+		You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminder")>>:
 	</span>
-	[[View reminders|Manage Personal Affairs]]
+	<<print $reminders.overdue.join('')>>
 	<br>
 <</if>>
 <<if $reminders.text.length > 0>>
-	&nbsp;&nbsp;&nbsp;&nbsp;
 	You have <<=numberWithPluralOne($reminders.text.length, "reminder")>>:
-	<<print $reminders.text>>
+	<<print $reminders.text.join('')>>
 	<br>
 <</if>>
+<<if $reminders.text.length > 0 || $reminders.overdue.length > 0>>
+	[[Manage reminders|Manage Personal Affairs]]
+<</if>>
 
 <<if $seeFCNN == 1>>
 	<<if $FCNNstation != 1 && $week >= 90>>