@@ -136,11 +136,12 @@
 (define *tests-sort-options* (vector (vector "Sort +a" 'testname   "ASC")
 				     (vector "Sort -a" 'testname   "DESC")
 				     (vector "Sort +t" 'event_time "ASC")
 				     (vector "Sort -t" 'event_time "DESC")
 				     (vector "Sort +s" 'statestatus "ASC")
-				     (vector "Sort -s" 'statestatus "DESC")))
+				     (vector "Sort -s" 'statestatus "DESC")
+				     (vector "Sort +a" 'testname   "ASC")))
 
 (define *tests-sort-type-index* '(("+testname" 0)
 				  ("-testname" 1)
 				  ("+event_time" 2)
 				  ("-event_time" 3)
@@ -477,11 +478,11 @@
 			   ;;(teststart  (db:test-get-event_time test))
 			   (runtime    (db:test-get-run_duration test))
 			   (buttontxt  (cond
 					((equal? teststate "COMPLETED") teststatus)
 					((and (equal? teststate "NOT_STARTED")
-					      (member teststatus '("ZERO_ITEMS" "BLOCKED" "PREQ_FAIL" "PREQ_DISCARDED" "KEEP_TRYING" "TEN_STRIKES")))
+					      (member teststatus '("ZERO_ITEMS" "BLOCKED" "PREQ_FAIL" "PREQ_DISCARDED" "TIMED_OUT" "KEEP_TRYING" "TEN_STRIKES")))
 					 teststatus)
 					(else
 					 teststate)))
 			   (button     (vector-ref columndat rown))
 			   (color      (car (gutils:get-color-for-state-status teststate teststatus)))