Style updates

Updates for better compatibility for recent Shopify UI changes