diff --git a/include/testData_queue.php b/include/testData_queue.php
index af2b9db..c2c2bc3 100644
--- a/include/testData_queue.php
+++ b/include/testData_queue.php
@@ -66,7 +66,8 @@ class testData_queue
 
         /* If we are processing queued test results with a queued distribution,
            we display some additional help here */
-        if($this->oDistribution->sQueued != "false" && $this->canEdit())
+        if($this->oDistribution->iDistributionId &&
+                $this->oDistribution->sQueued != "false" && $this->canEdit())
         {
             echo "The user submitted a new distribution, which will be un-queued ".
                 "together with the test data unless you select an existing one ".
@@ -78,7 +79,11 @@ class testData_queue
            distribution form here */
         if(!$this->oTestData->iDistributionId or 
                 $this->oDistribution->sQueued != "false")
+        {
+            echo html_frame_start("New Distribution", "90%");
             $this->oDistribution->outputEditor();
+            echo html_frame_end();
+        }
     }
 
     function getOutputEditorValues($aClean)