changes to checkout page template and minor cleanup