WP-2814: Added more styling changes