diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index ea60b3b7bd..0c47892598 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -309,15 +309,14 @@ def filesubmission(element, value, status, render_template, msg=''):
     eid = element.get('id')
 
     # Check if problem has been queued
-    queued = '' 
     queue_len = 0
     if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
-        queued = 'true'
+        status = 'queued'
         queue_len = msg
         msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
 
     context = { 'id': eid, 'state': status, 'msg': msg, 'value': value, 
-                'queued': queued, 'queue_len': queue_len
+                'queue_len': queue_len
               }
     html = render_template("filesubmission.html", context)
     return etree.XML(html) 
@@ -342,10 +341,9 @@ def textbox(element, value, status, render_template, msg=''):
     if not value: value = element.text	 # if no student input yet, then use the default input given by the problem
     
     # Check if problem has been queued
-    queued = '' 
     queue_len = 0
     if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
-        queued = 'true'
+        status = 'queued' 
         queue_len = msg
         msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
 
@@ -359,7 +357,7 @@ def textbox(element, value, status, render_template, msg=''):
                'mode': mode, 'linenumbers': linenumbers,
                'rows': rows, 'cols': cols,
                'hidden': hidden, 'tabsize': tabsize,
-               'queued': queued, 'queue_len': queue_len,
+               'queue_len': queue_len,
                }
     html = render_template("textbox.html", context)
     try:
diff --git a/common/lib/capa/capa/templates/filesubmission.html b/common/lib/capa/capa/templates/filesubmission.html
index 09bc287923..d3d57ee318 100644
--- a/common/lib/capa/capa/templates/filesubmission.html
+++ b/common/lib/capa/capa/templates/filesubmission.html
@@ -6,11 +6,9 @@
     <span class="correct" id="status_${id}"></span>
     % elif state == 'incorrect':
     <span class="incorrect" id="status_${id}"></span>
-    % elif state == 'incomplete':
-    <span class="incorrect" id="status_${id}"></span>
-    % endif
-    % if queued:
-    <span class="xqueue" id="${id}" >${queue_len}</span>
+    % elif state == 'queued':
+    <span class="processing" id="status_${id}"></span>
+    <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
     % endif
     <span class="debug">(${state})</span>
     <br/>
diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index f31b98b580..647f4fe4e8 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -13,14 +13,12 @@
   <span class="correct" id="status_${id}"></span>
   % elif state == 'incorrect':
   <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
-  <span class="incorrect" id="status_${id}"></span>
+  % elif state == 'queued':
+  <span class="processing" id="status_${id}"></span>
+  <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
   % endif
   % if hidden:
-      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
-  % endif
-  % if queued:
-    <span class="xqueue" id="${id}" >${queue_len}</span>
+  <div style="display:none;" name="${hidden}" inputid="input_${id}" />
   % endif
   <br/>
   <span class="debug">(${state})</span>