diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 06243254d..21dad1663 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.6.4
  - Brand new Survey system.  Make sure to export your old results as they will
+ - Made it more obvious how to check out when viewing the cart.
  - Added a wait timeout parameter to the WAITING method, so that Spectre
    doesn't have to check something that the workflow activity knows it will
    have to wait on for a while.
diff --git a/docs/upgrades/packages-7.6.4/default-shopping-cart-template.wgpkg b/docs/upgrades/packages-7.6.4/default-shopping-cart-template.wgpkg
index 7e15f0623..318e8bde4 100644
Binary files a/docs/upgrades/packages-7.6.4/default-shopping-cart-template.wgpkg and b/docs/upgrades/packages-7.6.4/default-shopping-cart-template.wgpkg differ
diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
index b0de7e332..2342a810e 100644
--- a/lib/WebGUI/Shop/Cart.pm
+++ b/lib/WebGUI/Shop/Cart.pm
@@ -792,13 +792,13 @@ sub www_view {
             . WebGUI::Form::hidden($session, {name=>"itemId", value=>""})
             . WebGUI::Form::hidden($session, {name=>"callback", value=>""}),
         formFooter              => WebGUI::Form::formFooter($session),
-        updateButton            => WebGUI::Form::submit($session, {value=>$i18n->get("update cart button")}),
+        updateButton            => WebGUI::Form::submit($session, {value=>$i18n->get("update cart button"), extras=>q|id="updateCartButton"|}),
         checkoutButton          => WebGUI::Form::submit($session, {value=>$i18n->get("checkout button"), 
-            extras=>q|onclick="this.form.method.value='checkout';this.form.submit;"|}),
+            extras=>q|onclick="this.form.method.value='checkout';this.form.submit;" id="checkoutButton"|}),
         continueShoppingButton  => WebGUI::Form::submit($session, {value=>$i18n->get("continue shopping button"), 
-            extras=>q|onclick="this.form.method.value='continueShopping';this.form.submit;"|}),
+            extras=>q|onclick="this.form.method.value='continueShopping';this.form.submit;" id="continueShoppingButton"|}),
         chooseShippingButton    => WebGUI::Form::submit($session, {value=>$i18n->get("choose shipping button"), 
-            extras=>q|onclick="setCallbackForAddressChooser(this.form);"|}),
+            extras=>q|onclick="setCallbackForAddressChooser(this.form);" id="chooseAddressButton"|}),
         shipToButton    => WebGUI::Form::submit($session, {value=>$i18n->get("ship to button"), 
             extras=>q|onclick="setCallbackForAddressChooser(this.form);"|}),
         subtotalPrice           => $self->formatCurrency($self->calculateSubtotal()),
diff --git a/lib/WebGUI/i18n/English/Shop.pm b/lib/WebGUI/i18n/English/Shop.pm
index 51974de0f..6f9183459 100644
--- a/lib/WebGUI/i18n/English/Shop.pm
+++ b/lib/WebGUI/i18n/English/Shop.pm
@@ -916,7 +916,7 @@ our $I18N = {
 	},
 
 	'choose shipping button' => { 
-		message => q|Choose Address|,
+		message => q|Choose Address & Checkout|,
 		lastUpdated => 1224818677,
 		context => q|a button the user clicks on to choose shipping information and tax calculation|
 	},