Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -670,10 +670,19 @@
 			     (conc "megatest -target " keystring " -runname " runname 
 				   " -run -testpatt " (conc testname "/" (if (equal? item-path "")
 									"%" 
 									item-path))
 				   " -clean-cache"
+				   ))))
+	       (rerun-clean  (lambda (x)
+			    (iup:attribute-set! 
+			     command-text-box "VALUE"
+			     (conc "megatest -target " keystring " -runname " runname 
+				   " -rerun-clean -testpatt " (conc testname "/" (if (equal? item-path "")
+									"%" 
+									item-path))
+				   " -clean-cache"
 				   ))))
 	       (remove-test (lambda (x)
 			      (iup:attribute-set!
 			       command-text-box "VALUE"
 			       (conc "megatest -remove-runs -target " keystring " -runname " runname
@@ -730,19 +739,31 @@
 				(host-info-panel testdat store-label)
 				(submegatest-panel dbstruct keydat testdat runname testconfig))
 			       ;; The controls
 			       (iup:frame #:title "Actions" 
 					  (iup:vbox
-					   (iup:hbox 
-					    (iup:button "View Log"      #:action viewlog      #:size "80x")
-					    (iup:button "Start Xterm"   #:action xterm        #:size "80x")
-					    (iup:button "Run Test"      #:action run-test     #:size "80x")
-					    (iup:button "Clean Test"    #:action remove-test  #:size "80x")
-					    (iup:button "CleanRunExecute!"    #:action clean-run-execute #:size "80x")
-					    (iup:button "Kill All Jobs" #:action kill-jobs    #:size "80x")
-					    (iup:button "Archive Test"  #:action archive-test #:size "80x")
-					    (iup:button "Close"         #:action (lambda (x)(exit)) #:size "80x"))
+					   (iup:hbox
+					    (iup:frame
+					     #:title "Immediate"
+					     (iup:hbox
+					      (iup:button "Start Xterm"   #:action xterm        #:size "80x")
+					      (iup:button "CleanRunExecute!"    #:action clean-run-execute #:size "80x")
+					      (iup:button "View Log"      #:action viewlog      #:size "80x")))
+					    (iup:frame
+					     #:title "Command line"
+					     (iup:hbox
+					      (iup:button "Run Test"      #:action run-test     #:size "80x")
+					      (iup:button "Rerun-clean"   #:action rerun-clean  #:size "80x")
+					      (iup:button "Clean Test"    #:action remove-test  #:size "80x")
+					      (iup:button "Kill All Jobs" #:action kill-jobs    #:size "80x")))
+					    (iup:label "" #:expand "HORIZONTAL")
+					    (iup:frame
+					     #:title "Other"
+					     (iup:hbox
+					      ;; (iup:button "Archive Test"  #:action archive-test #:size "80x")
+					      (iup:button "Close"         #:action (lambda (x)(exit)) #:size "80x")
+					      )))
 					   (apply 
 					    iup:hbox
 					    (list command-text-box command-launch-button))))
 			       (set-fields-panel dbstruct run-id test-id testdat)
 			       (let ((tabs