WP-3044: small cleanup on variable and heading.
WP-3044: updated container gradients.