diff --git a/docs/upgrades/upgrade_7.5.2-7.5.3.pl b/docs/upgrades/upgrade_7.5.2-7.5.3.pl
index 555916307..9e31858fa 100644
--- a/docs/upgrades/upgrade_7.5.2-7.5.3.pl
+++ b/docs/upgrades/upgrade_7.5.2-7.5.3.pl
@@ -48,6 +48,7 @@ sub convertTransactionLog {
     $session->db->write("create table transaction (
         transactionId varchar(22) binary not null primary key,
         isSuccessful bool not null default 0,
+		orderNumber int not null auto_increment unique,
 		transactionCode varchar(100),
 		statusCode varchar(35),
 		statusMessage varchar(100),
diff --git a/lib/WebGUI/Content/Shop.pm b/lib/WebGUI/Content/Shop.pm
index 8896b6198..d9b5f1d62 100644
--- a/lib/WebGUI/Content/Shop.pm
+++ b/lib/WebGUI/Content/Shop.pm
@@ -167,7 +167,7 @@ sub www_tax {
     my $session = shift;
     my $output = undef;
     my $method = "www_".$session->form->get("method");
-    my $tax = WebGUI::Shop::Tax->create($session);
+    my $tax = WebGUI::Shop::Tax->new($session);
     if ($method ne "www_" && $tax->can($method)) {
         $output = $tax->$method();
     }
@@ -186,7 +186,7 @@ sub www_transaction {
     my $session = shift;
     my $output = undef;
     my $method = "www_".$session->form->get("method");
-    my $transaction = WebGUI::Shop::Transaction->create($session);
+    my $transaction = WebGUI::Shop::Transaction->new($session);
     if ($method ne "www_" && $transaction->can($method)) {
         $output = $transaction->$method();
     }
diff --git a/lib/WebGUI/Shop/Transaction.pm b/lib/WebGUI/Shop/Transaction.pm
index 6ba0f15e1..9f2c77b83 100644
--- a/lib/WebGUI/Shop/Transaction.pm
+++ b/lib/WebGUI/Shop/Transaction.pm
@@ -343,7 +343,7 @@ sub www_getTransactionsAsJson {
     my ($db, $form) = $self->session->quick(qw(db form));
     my $startIndex = $form->get('startIndex') || 0;
     my $numberOfResults = $form->get('results') || 25;
-    my $transactions = $db->read('select transactionId, transactionCode, paymentDriverLabel,
+    my $transactions = $db->read('select orderNumber, transactionId, transactionCode, paymentDriverLabel,
         dateOfPurchase, username, amount, isSuccessful, statusCode, statusMessage
         from transaction order by dateOfPurchase desc limit ?,?', [$startIndex, $numberOfResults]);
     my $totalRecords = $db->quickScalar('select found_rows()');
@@ -404,7 +404,7 @@ YAHOO.util.Event.onDOMReady(function () {
     mySource.responseSchema = {
         resultsList : 'records',
         totalRecords: 'totalRecords',
-        fields      : [ 'transactionCode', 'paymentDriverLabel',
+        fields      : [ 'transactionCode', 'orderNumber', 'paymentDriverLabel',
             'transactionId', 'dateOfPurchase', 'username', 'amount', 'isSuccessful', 'statusCode', 'statusMessage']
     };
 
@@ -417,26 +417,26 @@ YAHOO.util.Event.onDOMReady(function () {
         containers         : ['paging'],
         pageLinks          : 5,
         rowsPerPage        : 25,
-        rowsPerPageOptions : [25,50,100],
+        rowsPerPageOptions : [10,25,50,100],
         template           : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink} {RowsPerPageDropdown}"
     });
 
     var myTableConfig = {
-        initialRequest         : ';startIndex=0;results=25',
+        initialRequest         : ';startIndex=0',
         generateRequest        : buildQueryString,
         paginationEventHandler : DataTable.handleDataSourcePagination,
         paginator              : myPaginator
     };
 
-    YAHOO.widget.DataTable.formatViewTransaction = function(elCell, oRecord, oColumn, transactionId) {
+    YAHOO.widget.DataTable.formatViewTransaction = function(elCell, oRecord, oColumn, orderNumber) {
 STOP
-	$output .= q{elCell.innerHTML = '<a href="}.$url->page('shop=transaction;method=viewTransaction')
-        .q{;transactionId=' + transactionId + '">' + transactionId + '</a>'; };
+	$output .= q{elCell.innerHTML = '<a href="}.$url->page(q{shop=transaction;method=viewTransaction})
+        .q{;transactionId=' + oRecord.getData('transactionId') + '">' + orderNumber + '</a>'; };
     $output .= '
         }; 
         var myColumnDefs = [
     ';
-    $output .= '{key:"transactionId", label:"'.$i18n->get('transaction id').'", formatter:YAHOO.widget.DataTable.formatViewTransaction},';
+    $output .= '{key:"orderNumber", label:"'.$i18n->get('order number').'", formatter:YAHOO.widget.DataTable.formatViewTransaction},';
     $output .= '{key:"dateOfPurchase", label:"'.$i18n->get('date').'",formatter:YAHOO.widget.DataTable.formatDate},';
     $output .= '{key:"username", label:"'.$i18n->get('username').'"},';
     $output .= '{key:"amount", label:"'.$i18n->get('price').'",formatter:YAHOO.widget.DataTable.formatCurrency},';
diff --git a/lib/WebGUI/i18n/English/Shop.pm b/lib/WebGUI/i18n/English/Shop.pm
index 5bb2288fd..656a52a88 100644
--- a/lib/WebGUI/i18n/English/Shop.pm
+++ b/lib/WebGUI/i18n/English/Shop.pm
@@ -15,8 +15,8 @@ our $I18N = {
 		context => q|field label|
 	},
 
-	'transaction id' => { 
-		message => q|Transaction Id|,
+	'order number' => { 
+		message => q|Order #|,
 		lastUpdated => 0,
 		context => q|field label|
 	},