Style updates

Changes for better compatibility with recent Shopify UI update.