Your uploaded file currently has all three of those inconsistencies.
Do not change your CSS, product query, payment, Buy Now, Add to Cart, preview, search, or pagination code for this change. Only the category/root and product-meta PHP sections need to be changed