[WP] Style fixes