diff --git a/public/js/directives/directives.js b/public/js/directives/directives.js
index b7cf52766c..62c225f39f 100644
--- a/public/js/directives/directives.js
+++ b/public/js/directives/directives.js
@@ -139,9 +139,9 @@ habitrpg
             type: 'daily',
             placeHolder: 'New Daily'
           }, {
-            header: 'Todos',
+            header: 'To-Dos',
             type: 'todo',
-            placeHolder: 'New Todo'
+            placeHolder: 'New To-Do'
           }, {
             header: 'Rewards',
             type: 'reward',
diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade
index bbb1675c6b..ca91592eea 100644
--- a/views/shared/tasks/lists.jade
+++ b/views/shared/tasks/lists.jade
@@ -36,6 +36,9 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
             input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', required)
           input.addtask-btn(type='submit', value='＋', ng-disabled='new{{list.type}}form.$invalid')
         hr
+        .alert.alert-warning(ng-if='list.type=="todo" && obj[list.type+"s"].length > 100')
+          | Clear completed To-Dos 
+          i.icon-question-sign(popover="You have a lot of To-Dos, which can cause performance issues. Be sure ot clear them periodically (see \"Completed\" tab at the bottom).", popover-trigger='mouseenter', popover-placement='left')
 
         // Actual List
         ul(class='{{list.type}}s', ng-show='obj[list.type + "s"].length > 0', habitrpg-sortable)