Help needed with final tweaks to shop in Marketpress please!

Please take a look at this link:

http://69.89.30.241/dev/frenchietest/pet-supplies-shop/products/earth-rated-poop-bags-compostable/

The first add to cart button on the page is put there with a shortcode, and the second is put there by the plugin. Notice how the item is on sale, but the sale price is only reflected on the second instance of the shop button. What can I add to the code to make sure the sale price is showing up in the shortcode?

Also, please look at this link:

http://69.89.30.241/dev/frenchietest/pet-supplies-shop/page/2/

On any item that has options (hipster denim collar is one, k9 kooling bed is another), you can't click on the photo or item title to go to the product page like you can with the other items. Is there a way to fix that?

These are the laaaaaast two edits my client has before I can push live and I have no idea how to address either one. Thank you!