diff --git a/controllers/shipments_controller.php b/controllers/shipments_controller.php
index a64b09a3..899955d5 100644
--- a/controllers/shipments_controller.php
+++ b/controllers/shipments_controller.php
@@ -9,7 +9,6 @@ class ShipmentsController extends AppController {
 
 	    'contain' => false,
 	    'limit' => 300,
-	    'order'=>array('Shipment.id' => 'desc'),
 	    'recursive' => 1
 
     );
diff --git a/models/shipment.php b/models/shipment.php
index 55dafc3b..2333f2ee 100644
--- a/models/shipment.php
+++ b/models/shipment.php
@@ -9,6 +9,8 @@ class Shipment extends AppModel {
 
     var $recursive = 1;
 
+    var $order = array('Shipment.date_arrived' => 'DESC', 'Shipment.date_dispatched'=>'DESC');
+
     //The Associations below have been created with all possible keys, those that are not needed can be removed
     var $belongsTo = array(
 	    'FreightForwarder' => array(
diff --git a/views/documents/pdf.ctp b/views/documents/pdf.ctp
index 0abfefa7..a3953a3d 100755
--- a/views/documents/pdf.ctp
+++ b/views/documents/pdf.ctp
@@ -38,14 +38,9 @@ foreach($document['DocPage'] as $page) {
     $pdfdoc->AddPage();
     $pdfdoc->Page1Header();
     if($firstPageDone == false) {
-
-	/*$pdfdoc->DetailsBox($docTypeFullName, $companyName, $emailTo, $attention, $fromName,
-		$fromEmail, $enquiryNumber, $your_reference, $issue_date);
-*/
 	
-
 	$pdfdoc->DetailsBoxHTML($docTypeFullName, $companyName, $emailTo, $attention, $fromName,
-	$fromEmail, $enquiryNumber, $your_reference, $issue_date, '30');
+		$fromEmail, $enquiryNumber, $your_reference, $issue_date, '30');
 
 	$firstPageDone = true;